r5026 - in trunk: BOOK/introduction/welcome BOOK/postlfs/security BOOK/server/major patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 9 15:30:43 PDT 2005


Author: randy
Date: 2005-09-09 16:30:38 -0600 (Fri, 09 Sep 2005)
New Revision: 5026

Added:
   trunk/patches/xinetd-2.3.13-gcc4-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/linux_pam.xml
   trunk/BOOK/server/major/xinetd.xml
Log:
Added a GCC-4 patch to the xinetd instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-09 21:50:49 UTC (rev 5025)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-09 22:30:38 UTC (rev 5026)
@@ -45,6 +45,9 @@
       <para>September 9th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a GCC-4 patch to the xinetd instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added a GCC-4 patch to the Linux-PAM instructions.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/postlfs/security/linux_pam.xml
===================================================================
--- trunk/BOOK/postlfs/security/linux_pam.xml	2005-09-09 21:50:49 UTC (rev 5025)
+++ trunk/BOOK/postlfs/security/linux_pam.xml	2005-09-09 22:30:38 UTC (rev 5026)
@@ -62,7 +62,7 @@
       <listitem>
         <para>Optional documentation: <ulink
         url="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-&Linux_PAM-version;-docs.tar.bz2"/>
-      </para>
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -70,8 +70,7 @@
       <title>Patches</title>
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/Linux-PAM-&Linux_PAM-version;-gcc4-1.patch"/>
-      </para>
+        url="&patch-root;/Linux-PAM-&Linux_PAM-version;-gcc4-1.patch"/></para>
       </listitem>
     </itemizedlist>
 

Modified: trunk/BOOK/server/major/xinetd.xml
===================================================================
--- trunk/BOOK/server/major/xinetd.xml	2005-09-09 21:50:49 UTC (rev 5025)
+++ trunk/BOOK/server/major/xinetd.xml	2005-09-09 22:30:38 UTC (rev 5026)
@@ -54,6 +54,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/xinetd-&xinetd-version;-gcc4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">xinetd Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -67,7 +75,8 @@
     <para>Install <application>xinetd</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../xinetd-&xinetd-version;-gcc4-1.patch &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

Added: trunk/patches/xinetd-2.3.13-gcc4-1.patch
===================================================================
--- trunk/patches/xinetd-2.3.13-gcc4-1.patch	2005-09-09 21:50:49 UTC (rev 5025)
+++ trunk/patches/xinetd-2.3.13-gcc4-1.patch	2005-09-09 22:30:38 UTC (rev 5026)
@@ -0,0 +1,36 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-07
+Initial Package Version: 2.3.13
+Upstream Status:         Not submitted
+Origin:                  Fedora Development CVS
+Description:             Fixes compilation error if using GCC-4.x
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur xinetd-2.3.13-orig/xinetd/service.c xinetd-2.3.13/xinetd/service.c
+--- xinetd-2.3.13-orig/xinetd/service.c	2003-11-16 12:44:10.000000000 +0000
++++ xinetd-2.3.13/xinetd/service.c	2005-08-07 18:37:33.395942648 +0000
+@@ -764,8 +764,8 @@
+                return FAILED;
+ 
+             if ( last == NULL ) {
+-               last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = 
+-		  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
++               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
++	       last = SAIN(SVC_LAST_DGRAM_ADDR(sp));
+             }
+ 
+             (void) time( &current_time ) ;
+@@ -791,8 +791,8 @@
+                return FAILED;
+ 
+ 	    if( last == NULL ) {
+-               last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = 
+-		  SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++               SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) );
++               last = SAIN6( SVC_LAST_DGRAM_ADDR(sp) );
+             }
+ 
+             (void) time( &current_time ) ;


Property changes on: trunk/patches/xinetd-2.3.13-gcc4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list