Ignore:
Timestamp:
10/21/2022 08:39:23 PM (19 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal
Children:
42192d9f
Parents:
8955f28 (diff), c7f3c154 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • postlfs/security/gnupg2.xml

    r8955f28 r569bf2f  
    77  <!ENTITY gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
    88  <!ENTITY gnupg2-download-ftp  "&gnupg-ftp;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
    9   <!ENTITY gnupg2-md5sum        "1c6a6722b9cececcf10ca4e24106e34b">
     9  <!ENTITY gnupg2-md5sum        "f9e9dfaf150d31abc77d09e509c6231b">
    1010  <!ENTITY gnupg2-size          "7.3 MB">
    11   <!ENTITY gnupg2-buildsize     "161 MB (with all tests; add 25 MB for docs)">
    12   <!ENTITY gnupg2-time          "0.7 SBU (using parallelism=4; add 1.5 SBU for tests)">
     11  <!ENTITY gnupg2-buildsize     "128 MB (with tests)">
     12  <!ENTITY gnupg2-time          "0.4 SBU (using parallelism=4; add 0.3 SBU for tests)">
    1313]>
    1414
     
    127127    -i tools/Makefile.in</userinput></screen>
    128128-->
    129 <!-- Seems to be resolved in 2.2.29
    130     <para>
    131       Fix a issue causing build failure if
     129
     130    <para>
     131      First, fix an issue causing build failure if
    132132      <application>OpenLDAP</application> is not installed:
    133133    </para>
    134134
    135 <screen><userinput>sed -e '737a #if USE_LDAP' \
    136     -e '760a #endif' \
    137     -i dirmngr/dirmngr.c</userinput></screen>
    138 -->
     135<screen><userinput>sed -e '/ks_ldap_free_state/i #if USE_LDAP' \
     136    -e '/ks_get_state =/a #endif'           \
     137    -i dirmngr/server.c</userinput></screen>
    139138
    140139    <para>
Note: See TracChangeset for help on using the changeset viewer.