Changeset 30ebf46


Ignore:
Timestamp:
05/11/2021 04:03:15 PM (5 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.0, ken/refactor-virt, lazarus, qt5new, trunk
Children:
914ed0fc, f78dbb7
Parents:
d7a49ff2 (diff), f9cf8463 (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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    rd7a49ff2 r30ebf46  
    4242    </listitem>
    4343    -->
     44
     45   <listitem>
     46     <para>May 11th, 2021</para>
     47     <itemizedlist>
     48       <listitem>
     49         <para>[thomas] - Add a patch to make curl compatible with openldap-2.5.4. Fixes
     50         <ulink url="&blfs-ticket-root;15026">#15026</ulink>.</para>
     51       </listitem>
     52     </itemizedlist>
     53   </listitem>
    4454
    4555   <listitem>
  • networking/netlibs/curl.xml

    rd7a49ff2 r30ebf46  
    7070        <para>
    7171          Estimated build time: &curl-time;
     72        </para>
     73      </listitem>
     74    </itemizedlist>
     75
     76    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     77    <itemizedlist spacing="compact">
     78      <listitem>
     79        <para>
     80          Required patch:
     81          <ulink url="&patch-root;/curl-&curl-version;-function_naming-1.patch"/>
    7282        </para>
    7383      </listitem>
     
    128138
    129139    <para>
     140      Apply a patch to avoid a naming collision when <xref linkend="openldap"/>
     141      is installed:
     142    </para>
     143
     144<screen><userinput remap="pre">patch -Np1 -i ../curl-&curl-version;-function_naming-1.patch</userinput></screen>
     145
     146    <para>
    130147      Install <application>cURL</application> by running the following
    131148      commands:
Note: See TracChangeset for help on using the changeset viewer.