cvs commit: patches/net-tools net-tools-1.60-gcc34-3.patch net-tools-1.60-kernel_headers-2.patch net-tools-1.60-gcc34-2.patch net-tools-1.60-kernel_headers-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jun 23 23:25:24 PDT 2004


jim         04/06/24 00:25:24

  Added:       net-tools net-tools-1.60-gcc34-3.patch
                        net-tools-1.60-kernel_headers-2.patch
  Removed:     net-tools net-tools-1.60-gcc34-2.patch
                        net-tools-1.60-kernel_headers-1.patch
  Log:
  Updated: net-tools-1.60-gcc34-3.patch net-tools-1.60-kernel_headers-2.patch
  
  Revision  Changes    Path
  1.1                  patches/net-tools/net-tools-1.60-gcc34-3.patch
  
  Index: net-tools-1.60-gcc34-3.patch
  ===================================================================
  Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org>
  Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org>
  Date: 2004-06-23
  Initial Package Version: 1.60
  Origin: N/A
  Upstream Status: N/A
  Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.
   
  diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
  --- net-tools-1.60.orig/hostname.c	2001-04-08 17:04:23.000000000 +0000
  +++ net-tools-1.60/hostname.c	2004-06-24 06:22:16.913258663 +0000
  @@ -78,6 +78,7 @@
               fprintf(stderr, _("%s: name too long\n"), program_name);
               break;
           default:
  +	    ((void)0);
           }
   	exit(1);
       }
  @@ -98,6 +99,7 @@
   	    fprintf(stderr, _("%s: name too long\n"), program_name);
   	    break;
   	default:
  +	    ((void)0);
   	}
   	exit(1);
       };
  @@ -117,6 +119,7 @@
   	    fprintf(stderr, _("%s: name too long\n"), program_name);
   	    break;
   	default:
  +	    ((void)0);
   	}
   	exit(1);
       };
  @@ -174,6 +177,7 @@
   	printf("%s\n", hp->h_name);
   	break;
       default:
  +	((void)0);
       }
   }
   
  diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
  --- net-tools-1.60.orig/lib/inet_sr.c	2000-02-20 21:46:45.000000000 +0000
  +++ net-tools-1.60/lib/inet_sr.c	2004-06-24 06:22:01.967840446 +0000
  @@ -105,6 +105,7 @@
       case 2:
          isnet = 0; break;
       default:
  +       ((void)0);
       }
   
       /* Fill in the other fields. */
  diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
  --- net-tools-1.60.orig/mii-tool.c	2000-05-21 14:31:17.000000000 +0000
  +++ net-tools-1.60/mii-tool.c	2004-06-24 06:22:01.971839755 +0000
  @@ -379,17 +379,17 @@
   /*--------------------------------------------------------------------*/
   
   const char *usage =
  -"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
  -       -V, --version               display version information
  -       -v, --verbose               more verbose output
  -       -R, --reset                 reset MII to poweron state
  -       -r, --restart               restart autonegotiation
  -       -w, --watch                 monitor for link status changes
  -       -l, --log                   with -w, write events to syslog
  -       -A, --advertise=media,...   advertise only specified media
  -       -F, --force=media           force specified media technology
  -media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
  -       (to advertise both HD and FD) 100baseTx, 10baseT\n";
  +"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
  +"       -V, --version               display version information\n"
  +"       -v, --verbose               more verbose output\n"
  +"       -R, --reset                 reset MII to poweron state\n"
  +"       -r, --restart               restart autonegotiation\n"
  +"       -w, --watch                 monitor for link status changes\n"
  +"       -l, --log                   with -w, write events to syslog\n"
  +"       -A, --advertise=media,...   advertise only specified media\n"
  +"       -F, --force=media           force specified media technology\n"
  +"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
  +"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
   
   int main(int argc, char **argv)
   {
  
  
  
  1.1                  patches/net-tools/net-tools-1.60-kernel_headers-2.patch
  
  Index: net-tools-1.60-kernel_headers-2.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2004-06-24
  Initial Package Version: 2.6
  Origin: Gentoo and Self
  Upstream Status: N/A
  Description: Fixes Compile Issues with the 2.6 Kernel
   
  
  diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
  --- net-tools-1.60.orig/hostname.c	2001-04-08 17:04:23.000000000 +0000
  +++ net-tools-1.60/hostname.c	2004-06-24 06:17:32.517305695 +0000
  @@ -42,10 +42,16 @@
   #include "config.h"
   #include "version.h"
   #include "../intl.h"
  +#include <linux/version.h>
   
   #if HAVE_AFDECnet
  +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
   #include <netdnet/dn.h>
   #endif
  +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
  +#include <linux/dn.h>
  +#endif
  +#endif
   
   char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
   
  diff -Naur net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
  --- net-tools-1.60.orig/lib/x25_sr.c	2000-05-20 13:38:10.000000000 +0000
  +++ net-tools-1.60/lib/x25_sr.c	2004-06-24 06:15:45.163773724 +0000
  @@ -22,6 +22,7 @@
   #include <sys/socket.h>
   #include <sys/ioctl.h>
   #include <linux/x25.h>
  +#include <linux/version.h>
   #include <ctype.h>
   #include <errno.h>
   #include <netdb.h>
  @@ -77,7 +78,11 @@
     rt.sigdigits=sigdigits;
   
     /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
  +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
     memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
  +#else
  +  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
  +#endif
   
     while (*args) {
   	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
  
  
  



More information about the patches mailing list