r5017 - in trunk: BOOK/introduction/welcome BOOK/postlfs/security patches

richard at linuxfromscratch.org richard at linuxfromscratch.org
Tue Sep 6 12:15:14 PDT 2005


Author: richard
Date: 2005-09-06 13:15:13 -0600 (Tue, 06 Sep 2005)
New Revision: 5017

Added:
   trunk/patches/gnupg-1.4.2-curl_LDAP-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/gnupg.xml
Log:
added required patch to GnuPG-1.4.2

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-06 17:43:41 UTC (rev 5016)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-06 19:15:13 UTC (rev 5017)
@@ -44,6 +44,10 @@
     <listitem>
       <para>September 6th, 2005</para>
       <itemizedlist>
+      <listitem>
+          <para>[richard] - Added patch to GnuPG-1.4.2 as required by
+          release notes.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to libIDL-0.8.6. Also added documentation
           installation commands to the instructions.</para>

Modified: trunk/BOOK/postlfs/security/gnupg.xml
===================================================================
--- trunk/BOOK/postlfs/security/gnupg.xml	2005-09-06 17:43:41 UTC (rev 5016)
+++ trunk/BOOK/postlfs/security/gnupg.xml	2005-09-06 19:15:13 UTC (rev 5017)
@@ -56,16 +56,15 @@
       </listitem>
     </itemizedlist>
 
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/gnupg-&gnupg-version;-po_install_fix-1.patch"/>
+        url="&patch-root;/gnupg-&gnupg-version;-curl_LDAP-1.patch"/>
       </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
 
@@ -85,7 +84,8 @@
     <para>Install <application>GnuPG</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &&
+<screen><userinput>patch -Np1 -i ../gnupg-&gnupg-version;-curl_LDAP-1.patch &&
+./configure --prefix=/usr --libexecdir=/usr/lib &&
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

Added: trunk/patches/gnupg-1.4.2-curl_LDAP-1.patch
===================================================================
--- trunk/patches/gnupg-1.4.2-curl_LDAP-1.patch	2005-09-06 17:43:41 UTC (rev 5016)
+++ trunk/patches/gnupg-1.4.2-curl_LDAP-1.patch	2005-09-06 19:15:13 UTC (rev 5017)
@@ -0,0 +1,22 @@
+Submitted By: Richard A Downing <richard at linuxfromscratch dot org>
+Date: 2005-09-05
+Initial Package Version: 1.4.2
+Upstream Status: In CVS
+Origin: http://lists.gnupg.org/pipermail/gnupg-announce/2005q3/000200.html
+Description: Required patch if --with-libcurl is applied to configure.
+
+diff -Naur gnupg-1.4.2/g10/keyserver.c gnupg-1.4.2/g10/keyserver.c
+--- gnupg-1.4.2/g10/keyserver.c	2005-07-22 15:55:11.000000000 +0000
++++ gnupg-1.4.2/g10/keyserver.c	2005-09-05 09:22:23.000000000 +0000
+@@ -860,7 +860,9 @@
+ static const char *
+ keyserver_typemap(const char *type)
+ {
+-  if(strcmp(type,"ldaps")==0)
++  if(strcmp(type,"ldap")==0)
++    return "ldap";
++  else if(strcmp(type,"ldaps")==0)
+     return "ldap";
+   else if(curl_can_handle(type))
+     return "curl";
+


Property changes on: trunk/patches/gnupg-1.4.2-curl_LDAP-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list