From f9cf8463c88e9c4847261ff64a4cb2c957c94b60 Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Tue, 11 May 2021 16:18:11 +0200
Subject: [PATCH] Add patch to curl fixing a naming collision

---
 introduction/welcome/changelog.xml | 10 ++++++++++
 networking/netlibs/curl.xml        | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ad688d6e88..22a3d735f4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -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>
diff --git a/networking/netlibs/curl.xml b/networking/netlibs/curl.xml
index 1cc1096968..92ad3d1cfb 100644
--- a/networking/netlibs/curl.xml
+++ b/networking/netlibs/curl.xml
@@ -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: