net-tools/net-tools-1.60-compile_fixes.patch

   1 diff -Nru net-tools-1.60/mii-tool.c net-tools-1.60-new/mii-tool.c
   2 --- net-tools-1.60/mii-tool.c   2000-05-21 16:31:17.000000000 +0200
   3 +++ net-tools-1.60-new/mii-tool.c       2003-11-08 02:11:31.000000000 +0100
   4 @@ -379,17 +379,17 @@
   5  /*--------------------------------------------------------------------*/
   6
   7  const char *usage =
   8 -"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
   9 -       -V, --version               display version information
  10 -       -v, --verbose               more verbose output
  11 -       -R, --reset                 reset MII to poweron state
  12 -       -r, --restart               restart autonegotiation
  13 -       -w, --watch                 monitor for link status changes
  14 -       -l, --log                   with -w, write events to syslog
  15 -       -A, --advertise=media,...   advertise only specified media
  16 -       -F, --force=media           force specified media technology
  17 -media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
  18 -       (to advertise both HD and FD) 100baseTx, 10baseT\n";
  19 +"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
  20 +"       -V, --version               display version information\n"
  21 +"       -v, --verbose               more verbose output\n"
  22 +"       -R, --reset                 reset MII to poweron state\n"
  23 +"       -r, --restart               restart autonegotiation\n"
  24 +"       -w, --watch                 monitor for link status changes\n"
  25 +"       -l, --log                   with -w, write events to syslog\n"
  26 +"       -A, --advertise=media,...   advertise only specified media\n"
  27 +"       -F, --force=media           force specified media technology\n"
  28 +"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
  29 +"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
  30
  31  int main(int argc, char **argv)
  32  {
  33 diff -ru net-tools-1.60/lib/x25_sr.c net-tools-1.60-new/lib/x25_sr.c
  34 --- net-tools-1.60/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
  35 +++ net-tools-1.60-new/lib/x25_sr.c     2004-04-30 23:37:10.536499600 +0200
  36 @@ -77,7 +77,7 @@
  37    rt.sigdigits=sigdigits;
  38
  39    /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
  40 -  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
  41 +  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
  42
  43    while (*args) {
  44         if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
  45 diff -ru net-tools-1.60/lib/inet6_sr.c net-tools-1.60-new/lib/inet6_sr.c
  46 --- net-tools-1.60/lib/inet6_sr.c       2000-05-22 23:18:37.000000000 +0200
  47 +++ net-tools-1.60-new/lib/inet6_sr.c   2004-04-30 23:48:24.146095376 +0200
  48 @@ -32,6 +32,7 @@
  49  #include "net-support.h"
  50  #include "pathnames.h"
  51  #include "intl.h"
  52 +#include "util.h"
  53  #include "net-features.h"
  54
  55
  56 diff -ru net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c
  57 --- net-tools-1.60/lib/inet_sr.c        2000-02-20 22:46:45.000000000 +0100
  58 +++ net-tools-1.60-new/lib/inet_sr.c    2004-05-01 00:01:21.358941064 +0200
  59 @@ -105,6 +105,7 @@
  60      case 2:
  61         isnet = 0; break;
  62      default:
  63 +       break;
  64      }
  65
  66      /* Fill in the other fields. */
  67 diff -ru net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c
  68 --- net-tools-1.60/hostname.c   2001-04-08 19:04:23.000000000 +0200
  69 +++ net-tools-1.60-new/hostname.c       2004-05-01 00:03:32.373023896 +0200
  70 @@ -31,6 +31,7 @@
  71   *              your option) any later version.
  72   */
  73  #include <stdio.h>
  74 +#include <stdlib.h>
  75  #include <unistd.h>
  76  #include <getopt.h>
  77  #include <string.h>
  78 @@ -78,6 +79,7 @@
  79              fprintf(stderr, _("%s: name too long\n"), program_name);
  80              break;
  81          default:
  82 +           break;
  83          }
  84         exit(1);
  85      }
  86 @@ -98,6 +100,7 @@
  87             fprintf(stderr, _("%s: name too long\n"), program_name);
  88             break;
  89         default:
  90 +           break;
  91         }
  92         exit(1);
  93      };
  94 @@ -117,6 +120,7 @@
  95             fprintf(stderr, _("%s: name too long\n"), program_name);
  96             break;
  97         default:
  98 +           break;
  99         }
 100         exit(1);
 101      };
 102 @@ -174,6 +178,7 @@
 103         printf("%s\n", hp->h_name);
 104         break;
 105      default:
 106 +       break;
 107      }
 108  }
 109
 110 @@ -330,7 +335,7 @@
 111         case 'h':
 112         default:
 113             usage();
 114 -
 115 +           break;
 116         };
 117
 118