r5027 - in trunk: BOOK/basicnet/netprogs BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 9 15:45:39 PDT 2005


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

Added:
   trunk/patches/inetutils-1.4.2-gcc4_fixes-3.patch
Modified:
   trunk/BOOK/basicnet/netprogs/inetutils.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Replaced the kernel_headers patch with a GCC-4 patch in the Inetutils instructions

Modified: trunk/BOOK/basicnet/netprogs/inetutils.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/inetutils.xml	2005-09-09 22:30:38 UTC (rev 5026)
+++ trunk/BOOK/basicnet/netprogs/inetutils.xml	2005-09-09 22:45:38 UTC (rev 5027)
@@ -58,7 +58,7 @@
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
+        url="&patch-root;/inetutils-&inetutils-version;-gcc4_fixes-3.patch"/></para>
       </listitem>
       <listitem>
         <para>Required Patch: <ulink
@@ -82,7 +82,7 @@
     <para>Install <application>Inetutils</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch &&
+<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-gcc4_fixes-3.patch &&
 patch -Np1 -i ../inetutils-&inetutils-version;-daemon_fixes-1.patch &&
 ./configure --prefix=/usr --libexecdir=/usr/sbin \
     --sysconfdir=/etc --localstatedir=/var \

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-09 22:30:38 UTC (rev 5026)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-09 22:45:38 UTC (rev 5027)
@@ -45,10 +45,15 @@
       <para>September 9th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Replaced the Kernel_Headers patch with a GCC-4 patch
+          in the Inetutils instructions.</para>
+        </listitem>
+        <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>
+          <para>[randy] - Added a GCC-4 patch to the Linux-PAM
+          instructions.</para>
         </listitem>
         <listitem>
           <para>[randy] - Updated to intltool-0.34.1.</para>

Added: trunk/patches/inetutils-1.4.2-gcc4_fixes-3.patch
===================================================================
--- trunk/patches/inetutils-1.4.2-gcc4_fixes-3.patch	2005-09-09 22:30:38 UTC (rev 5026)
+++ trunk/patches/inetutils-1.4.2-gcc4_fixes-3.patch	2005-09-09 22:45:38 UTC (rev 5027)
@@ -0,0 +1,41 @@
+Submitted By: Matthew Burgess <matthew at linuxfromscratch.org>
+Date: 2005-08-30
+Initial Package Version: 1.4.2
+Upstream Status: From upstream
+Origin: Greg Schafer <gschafer at zip.com.au> (http://www.diy-linux.org/downloads/patches/GCC4/inetutils-1.4.2-gcc4-fixes-1.patch)
+Description: Fix compilation issues with gcc4
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur inetutils-1.4.2.orig/ftp/ftp_var.h inetutils-1.4.2/ftp/ftp_var.h
+--- inetutils-1.4.2.orig/ftp/ftp_var.h	2000-07-08 01:00:53.000000000 +0000
++++ inetutils-1.4.2/ftp/ftp_var.h	2005-08-30 20:25:27.205932304 +0000
+@@ -36,8 +36,6 @@
+ #include <sys/param.h>
+ #include <setjmp.h>
+ 
+-#include "extern.h"
+-
+ #ifndef FTP_EXTERN
+ #define FTP_EXTERN extern
+ #endif
+@@ -129,3 +127,5 @@
+ FTP_EXTERN int macnum;			/* number of defined macros */
+ FTP_EXTERN struct macel macros[16];
+ FTP_EXTERN char macbuf[4096];
++
++#include "extern.h"
+diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c
+--- inetutils-1.4.2.orig/libinetutils/ttymsg.c	2001-11-01 15:52:19.000000000 +0000
++++ inetutils-1.4.2/libinetutils/ttymsg.c	2005-08-30 20:24:27.168059448 +0000
+@@ -132,7 +132,7 @@
+ 	    }
+ 	  if (wret)
+ 	    {
+-	      (char *)iov->iov_base += wret;
++	      iov->iov_base = (char *)iov->iov_base + wret;
+ 	      iov->iov_len -= wret;
+ 	    }
+ 	  continue;


Property changes on: trunk/patches/inetutils-1.4.2-gcc4_fixes-3.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list