diff -Nur net-tools-1.60/Makefile net-tools-1.61/Makefile --- net-tools-1.60/Makefile 2001-04-15 16:34:31.000000000 +0200 +++ net-tools-1.61/Makefile 2003-10-11 22:14:26.000000000 +0200 @@ -101,7 +101,7 @@ # -------- end of user definitions -------- MAINTAINER = Philip.Blundell@pobox.com -RELEASE = 1.60 +RELEASE = 1.61 .EXPORT_ALL_VARIABLES: diff -Nur net-tools-1.60/hostname.c net-tools-1.61/hostname.c --- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200 +++ net-tools-1.61/hostname.c 2003-10-11 22:04:17.000000000 +0200 @@ -9,7 +9,7 @@ * dnsdmoainname * nisdomainname {name|-F file} * - * Version: hostname 1.96 (1996-02-18) + * Version: hostname 1.101 (2003-10-11) * * Author: Peter Tobias * @@ -23,6 +23,10 @@ *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale + *20031011 {1.101} Maik Broemme: gcc 3.x fixes for the warnings and + * deprecated functions because they + * will be removed in future versions + * of gcc. * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -31,6 +35,7 @@ * your option) any later version. */ #include +#include #include #include #include @@ -98,6 +103,7 @@ fprintf(stderr, _("%s: name too long\n"), program_name); break; default: + break; } exit(1); }; @@ -117,6 +123,7 @@ fprintf(stderr, _("%s: name too long\n"), program_name); break; default: + break; } exit(1); }; @@ -174,6 +181,7 @@ printf("%s\n", hp->h_name); break; default: + break; } } diff -Nur net-tools-1.60/lib/inet_sr.c net-tools-1.61/lib/inet_sr.c --- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100 +++ net-tools-1.61/lib/inet_sr.c 2003-10-11 21:56:46.000000000 +0200 @@ -3,6 +3,10 @@ 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets 1999-10-07 - Kurt Garloff - for -host and gws: prefer host names over networks (or even reject) + 2003-10-11 - Maik Broemme - gcc 3.x fixes for the warnings and + deprecated functions because + they will be removed in future + versions of gcc. */ #include "config.h" @@ -105,6 +109,7 @@ case 2: isnet = 0; break; default: + break; } /* Fill in the other fields. */ diff -Nur net-tools-1.60/lib/x25.c net-tools-1.61/lib/x25.c --- net-tools-1.60/lib/x25.c 2000-05-20 20:53:25.000000000 +0200 +++ net-tools-1.61/lib/x25.c 2003-10-11 22:17:30.000000000 +0200 @@ -3,8 +3,13 @@ * support functions for the NET-3 base distribution. * * Version: @(#)x25.c 1.00 08/15/98 + * 1.01 10/11/03 + * + * Version 1.01 fixes compile problems with 2.6.x Kernels + * because the x25_address definition was changed. * * Author: Stephane Fillod, + * Maik Broemme, * based on ax25.c by: * Fred N. van Kempen, * Copyright 1993 MicroWalt Corporation @@ -22,6 +27,7 @@ #include #include #include +#include #include /* ARPHRD_X25 */ #include #include @@ -81,6 +87,9 @@ unsigned char *ptr; char *p; unsigned int sigdigits; +#if (DEBUG && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + struct x25_address x25; +#endif sap->sa_family = x25_aftype.af; ptr = ((struct sockaddr_x25 *)sap)->sx25_addr.x25_addr; @@ -119,7 +128,11 @@ /* All done. */ #ifdef DEBUG fprintf(stderr, "x25_input(%s): ", orig); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) for (i = 0; i < sizeof(x25_address); i++) +#else + for (i = 0; i < sizeof(x25); i++) +#endif fprintf(stderr, "%02X ", sap->sa_data[i] & 0377); fprintf(stderr, "\n"); #endif diff -Nur net-tools-1.60/lib/x25_sr.c net-tools-1.61/lib/x25_sr.c --- net-tools-1.60/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 +++ net-tools-1.61/lib/x25_sr.c 2003-10-11 22:17:15.000000000 +0200 @@ -3,8 +3,13 @@ * route change support functions. * * Version: @(#)x25_sr.c 1.00 08/15/98 + * 1.01 10/11/03 + * + * Version 1.01 fixes compile problems with 2.6.x Kernels + * because the x25_address definition was changed. * * Author: Stephane Fillod, + * Maik Broemme, * based on inet_sr.c * * This program is free software; you can redistribute it @@ -22,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +64,9 @@ { struct x25_route_struct rt; struct sockaddr_x25 sx25; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + struct x25_address x25; +#endif char target[128]; signed int sigdigits; @@ -77,7 +86,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(x25)); +#endif while (*args) { if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { diff -Nur net-tools-1.60/mii-tool.c net-tools-1.61/mii-tool.c --- net-tools-1.60/mii-tool.c 2000-05-21 16:31:17.000000000 +0200 +++ net-tools-1.61/mii-tool.c 2003-10-11 21:17:04.000000000 +0200 @@ -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) {