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

This commit is contained in:
Bruce Dubbs 2021-05-11 11:03:15 -05:00
commit 30ebf4695d
2 changed files with 27 additions and 0 deletions

View File

@ -42,6 +42,16 @@
</listitem>
-->
<listitem>
<para>May 11th, 2021</para>
<itemizedlist>
<listitem>
<para>[thomas] - Add a patch to make curl compatible with openldap-2.5.4. Fixes
<ulink url="&blfs-ticket-root;15026">#15026</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 9th, 2021</para>
<itemizedlist>

View File

@ -73,6 +73,16 @@
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/curl-&curl-version;-function_naming-1.patch"/>
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">cURL Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
@ -126,6 +136,13 @@
<screen><userinput remap="pre">grep -rl '#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
<para>
Apply a patch to avoid a naming collision when <xref linkend="openldap"/>
is installed:
</para>
<screen><userinput remap="pre">patch -Np1 -i ../curl-&curl-version;-function_naming-1.patch</userinput></screen>
<para>
Install <application>cURL</application> by running the following
commands: