Commit 9cc222c7 authored by Martina Ferrari's avatar Martina Ferrari

Update package to a newer commit, even if upstream is not releasing new versions.

* Update package to a newer commit, even if upstream is not releasing new
  versions.
* Remove many patches now merged upstream, update the rest.
parent 8bac7eee
net-tools (1.60+git20081202.2750e60-1) UNRELEASED; urgency=medium
* Update package to a newer commit, even if upstream is not releasing new
versions. Closes: #391495, #486448, #323261, #260587.
* Remove many patches now merged upstream, update the rest.
-- Martín Ferrari <tincho@debian.org> Sun, 06 Sep 2015 19:19:52 +0000
net-tools (1.60-27) unstable; urgency=medium
* Add patch to accept "pointtopoint" as a synonym for "pointopoint".
......
Index: net-tools-1.60/netstat.c
========================================
--- net-tools-1.60.orig/netstat.c
+++ net-tools-1.60/netstat.c
@@ -85,6 +85,8 @@
--- a/netstat.c
+++ b/netstat.c
@@ -86,6 +86,8 @@
#include <sys/ioctl.h>
#include <net/if.h>
#include <dirent.h>
......@@ -11,4 +9,3 @@ Index: net-tools-1.60/netstat.c
#include "net-support.h"
#include "pathnames.h"
This patch adds the --wide option to netstat, to avoid truncation of ipv6
addresses, by Luar Roji. (Bug #254243)
Already in upstream's CVS (rev 1.60)
Index: net-tools/man/en_US/netstat.8
===================================================================
--- net-tools.orig/man/en_US/netstat.8
+++ net-tools/man/en_US/netstat.8
@@ -8,7 +8,7 @@
.\" Modified: Tuan Hoang tqhoang@bigfoot.com
.\"
.\"
-.TH NETSTAT 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
+.TH NETSTAT 8 "2008-11-16" "net\-tools" "Linux Programmer's Manual"
.SH NAME
netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
@@ -118,6 +118,9 @@ Display summary statistics for each prot
.SS "\-\-verbose , \-v"
Tell the user what is going on by being verbose. Especially print some
useful information about unconfigured address families.
+.SS "\-\-wide , \-W"
+Do not truncate IP addresses by using output as wide as needed. This is
+optional for now to not break existing scripts.
.SS "\-\-numeric , \-n"
Show numerical addresses instead of trying to determine symbolic host, port
or user names.
Index: net-tools/netstat.c
===================================================================
--- net-tools.orig/netstat.c
+++ net-tools/netstat.c
@@ -149,6 +149,7 @@ int flag_udp = 0;
int flag_igmp= 0;
int flag_rom = 0;
int flag_exp = 1;
+int flag_wide= 0;
int flag_prg = 0;
int flag_arg = 0;
int flag_ver = 0;
@@ -782,16 +783,20 @@ static void tcp_do_one(int lnr, const ch
get_sname(htons(local_port), "tcp",
flag_not & FLAG_NUM_PORT));
- if ((strlen(local_addr) + strlen(buffer)) > 22)
- local_addr[22 - strlen(buffer)] = '\0';
+ if (!flag_wide) {
+ if ((strlen(local_addr) + strlen(buffer)) > 22)
+ local_addr[22 - strlen(buffer)] = '\0';
+ }
strcat(local_addr, ":");
strcat(local_addr, buffer);
snprintf(buffer, sizeof(buffer), "%s",
get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
- if ((strlen(rem_addr) + strlen(buffer)) > 22)
- rem_addr[22 - strlen(buffer)] = '\0';
+ if (!flag_wide) {
+ if ((strlen(rem_addr) + strlen(buffer)) > 22)
+ rem_addr[22 - strlen(buffer)] = '\0';
+ }
strcat(rem_addr, ":");
strcat(rem_addr, buffer);
@@ -1511,9 +1516,9 @@ static void version(void)
static void usage(void)
{
- fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
- fprintf(stderr, _(" netstat [-vnNcaeol] [<Socket> ...]\n"));
- fprintf(stderr, _(" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"));
+ fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
+ fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
+ fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cWnNe] -M | -s }\n\n"));
fprintf(stderr, _(" -r, --route display routing table\n"));
fprintf(stderr, _(" -i, --interfaces display interface table\n"));
@@ -1523,6 +1528,7 @@ static void usage(void)
fprintf(stderr, _(" -M, --masquerade display masqueraded connections\n\n"));
#endif
fprintf(stderr, _(" -v, --verbose be verbose\n"));
+ fprintf(stderr, _(" -W, --wide don't truncate IP addresses\n"));
fprintf(stderr, _(" -n, --numeric don't resolve names\n"));
fprintf(stderr, _(" --numeric-hosts don't resolve host names\n"));
fprintf(stderr, _(" --numeric-ports don't resolve port names\n"));
@@ -1572,6 +1578,7 @@ int main
{"programs", 0, 0, 'p'},
{"verbose", 0, 0, 'v'},
{"statistics", 0, 0, 's'},
+ {"wide", 0, 0, 'W'},
{"numeric", 0, 0, 'n'},
{"numeric-hosts", 0, 0, '!'},
{"numeric-ports", 0, 0, '@'},
@@ -1591,7 +1598,7 @@ int main
getroute_init(); /* Set up AF routing support */
afname[0] = '\0';
- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF)
+ while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF)
switch (i) {
case -1:
break;
@@ -1635,6 +1642,9 @@ int main
case 'i':
flag_int++;
break;
+ case 'W':
+ flag_wide++;
+ break;
case 'n':
flag_not |= FLAG_NUM;
break;
Patch by Antonio Galea <ant9000@netwise.it> to solve the socket number overflow
from #345331
diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c
--- net-tools-1.60/netstat.c 2005-12-30 16:52:15.000000000 +0100
+++ /tmp/dpep.15Gej9/net-tools-1.60/netstat.c 2005-12-30 16:56:00.000000000 +0100
@@ -313,8 +313,8 @@
--- a/netstat.c
+++ b/netstat.c
@@ -317,8 +317,8 @@
strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
inode_str[inode_str_len] = '\0';
......@@ -15,7 +14,7 @@ diff -urNad net-tools-1.60/netstat.c /tmp/dpep.15Gej9/net-tools-1.60/netstat.c
return(-1);
}
return(0);
@@ -334,8 +334,8 @@
@@ -338,8 +338,8 @@
{
char *serr;
......
--- a/netstat.c
+++ b/netstat.c
@@ -1742,6 +1742,7 @@
parsesnmp(flag_raw, flag_tcp, flag_udp);
#else
ENOSUPP("netstat", "AF INET");
+ exit(1);
#endif
} else if(!strcmp(afname, "inet6")) {
#if HAVE_AFINET6
@@ -1749,6 +1750,7 @@
parsesnmp6(flag_raw, flag_tcp, flag_udp);
#else
ENOSUPP("netstat", "AF INET6");
+ exit(1);
#endif
} else {
printf(_("netstat: No statistics support for specified address family: %s\n"), afname);
......@@ -3,10 +3,8 @@ Author: Kees Cook <kees@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/net-tools/+bug/515010
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569509
Index: net-tools-1.60/arp.c
===================================================================
--- net-tools-1.60.orig/arp.c 2010-02-11 15:19:16.702985736 -0800
+++ net-tools-1.60/arp.c 2010-02-11 15:22:29.729592589 -0800
--- a/arp.c
+++ b/arp.c
@@ -243,7 +243,8 @@
struct ifreq ifr;
struct hwtype *xhw;
......
Add support for -6 & -4 flags to route.c
From upstream CVS
Index: net-tools/route.c
===================================================================
--- net-tools.orig/route.c
+++ net-tools/route.c
@@ -2,7 +2,7 @@
* route This file contains an implementation of the command
* that manages the IP routing table in the kernel.
*
- * Version: $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
+ * Version: $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
*
* Maintainer: Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
*
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
}
/* Fetch the command-line arguments. */
- while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
+ while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
switch (i) {
case -1:
break;
@@ -176,6 +176,14 @@ int main(int argc, char **argv)
if ((i = aftrans_opt(optarg)))
exit(i);
break;
+ case '6':
+ if ((i = aftrans_opt("inet6")))
+ exit(i);
+ break;
+ case '4':
+ if ((i = aftrans_opt("inet")))
+ exit(i);
+ break;
case 'V':
version();
case 'h':
Sync with upstream CVS, complete log:
Revision 1.4 - Thu Sep 11 03:46:49 2003 UTC by ak
Fix off by one in name length checking
Revision 1.3 - Thu Mar 6 23:26:52 2003 UTC by ecki
Fix Debian Bug#178209, Fix RedHat Bug#85748: nameif segfaults
Revision 1.2 - Sun Nov 25 06:55:06 2001 UTC by ecki
fixed debian bug#111642 reported by Jonathan Amery <jdamery@pick.ucam.org>
(newline missing in nameif usage)
Index: net-tools/nameif.c
===================================================================
--- net-tools.orig/nameif.c
+++ net-tools/nameif.c
@@ -3,7 +3,7 @@
* Writen 2000 by Andi Kleen.
* Subject to the Gnu Public License, version 2.
* TODO: make it support token ring etc.
- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
*/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -117,7 +117,8 @@ int getmac(char *name, unsigned char *ma
}
struct change {
- struct change *next,**pprev;
+ struct change *next;
+ int found;
char ifname[IFNAMSIZ+1];
unsigned char mac[6];
};
@@ -139,10 +140,7 @@ int addchange(char *p, struct change *ch
ch->ifname, pos);
if (parsemac(p,ch->mac) < 0)
complain(_("cannot parse MAC `%s' at %s"), p, pos);
- if (clist)
- clist->pprev = &ch->next;
ch->next = clist;
- ch->pprev = &clist;
clist = ch;
return 0;
}
@@ -177,7 +175,7 @@ void readconf(void)
if (*p == '\0')
continue;
n = strcspn(p, " \t");
- if (n > IFNAMSIZ)
+ if (n > IFNAMSIZ-1)
complain(_("interface name too long at line %d"), line);
memcpy(ch->ifname, p, n);
ch->ifname[n] = 0;
@@ -200,7 +198,7 @@ struct option lopt[] = {
void usage(void)
{
- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}"));
+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n"));
exit(1);
}
@@ -277,21 +275,21 @@ int main(int ac, char **av)
ch = lookupmac(mac);
if (!ch)
continue;
-
- *ch->pprev = ch->next;
+
+ ch->found = 1;
if (strcmp(p, ch->ifname)) {
if (setname(p, ch->ifname) < 0)
complain(_("cannot change name of %s to %s: %s"),
p, ch->ifname, strerror(errno));
}
- free(ch);
}
fclose(ifh);
while (clist) {
struct change *ch = clist;
clist = clist->next;
- warning(_("interface '%s' not found"), ch->ifname);
+ if (!ch->found)
+ warning(_("interface '%s' not found"), ch->ifname);
free(ch);
}
Sync with upstream CVS, complete log:
Revision 1.12 - Sat Oct 11 21:08:10 2003 UTC by ecki
Maik Broemme contributed gcc warning fixes (break after default: label)
Revision 1.11 - Thu Jun 12 03:22:30 2003 UTC by ecki
make hostname compile warnign free with gcc 3.3 (Ec)
Index: net-tools/hostname.c
===================================================================
--- net-tools.orig/hostname.c
+++ net-tools/hostname.c
@@ -9,20 +9,19 @@
* dnsdmoainname
* nisdomainname {name|-F file}
*
- * Version: hostname 1.96 (1996-02-18)
+ * Version: hostname 1.101 (2003-10-11)
*
* Author: Peter Tobias <tobias@et-inf.fho-emden.de>
*
* Changes:
- * {1.90} Peter Tobias : Added -a and -i options.
- * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts
- * (major rewrite), usage.
- *960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/
- * setdomainname added
- *960218 {1.96} Bernd Eckenfels : netinet/in.h added
- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
+ * {1.90} Peter Tobias : Added -a and -i options.
+ * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
+ *19960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added
+ *19960218 {1.96} Bernd Eckenfels : netinet/in.h added
+ *19980629 {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 (default: break)
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -31,7 +30,9 @@
* your option) any later version.
*/
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
+#include <stdlib.h>
#include <getopt.h>
#include <string.h>
#include <netdb.h>
@@ -78,6 +79,7 @@ static void setnname(char *nname)
fprintf(stderr, _("%s: name too long\n"), program_name);
break;
default:
+ break;
}
exit(1);
}
@@ -97,7 +99,6 @@ static void sethname(char *hname)
case EINVAL:
fprintf(stderr, _("%s: name too long\n"), program_name);
break;
- default:
}
exit(1);
};
@@ -116,7 +117,6 @@ static void setdname(char *dname)
case EINVAL:
fprintf(stderr, _("%s: name too long\n"), program_name);
break;
- default:
}
exit(1);
};
@@ -173,7 +173,6 @@ static void showhname(char *hname, int c
*p = '\0';
printf("%s\n", hp->h_name);
break;
- default:
}
}
@@ -326,11 +325,12 @@ int main(int argc, char **argv)
break;
case 'V':
version();
+ break; // not reached
case '?':
case 'h':
default:
usage();
-
+ break; // not reached
};
This diff is collapsed.
Sync with upstream CVS, complete log:
Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki
use file version
Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki
make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743)
Index: net-tools/slattach.c
===================================================================
--- net-tools.orig/slattach.c
+++ net-tools/slattach.c
@@ -73,7 +73,7 @@
const char *Release = RELEASE,
- *Version = "@(#) slattach 1.21 (1999-11-21)",
+ *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
*Signature = "net-tools, Fred N. van Kempen et al.";
@@ -115,7 +115,7 @@ int opt_h = 0; /* "hangup" on carrier
int opt_k = 0; /* "keepalive" value */
#endif
int opt_l = 0; /* "lock it" flag */
-int opt_L = 0; /* clocal flag */
+int opt_L = 0; /* 3-wire mode flag */
int opt_m = 0; /* "set RAW mode" flag */
int opt_n = 0; /* "set No Mesg" flag */
#ifdef SIOCSOUTFILL
@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty)
tty->c_oflag = (0); /* output flags */
tty->c_lflag = (0); /* local flags */
speed = (tty->c_cflag & CBAUD); /* save current speed */
- tty->c_cflag = (CRTSCTS | HUPCL | CREAD); /* UART flags */
+ tty->c_cflag = (HUPCL | CREAD); /* UART flags */
if (opt_L)
tty->c_cflag |= CLOCAL;
+ else
+ tty->c_cflag |= CRTSCTS;
tty->c_cflag |= speed; /* restore speed */
return(0);
}
This diff is collapsed.
Sync with upstream CVS, complete log:
2006-10-10 22:14 ecki
* util-ank.h: fixed signedness compiler warning
2006-09-27 17:59 ecki
* mii.h: GigE Support by Stephen Hemminger from
http://developer.osdl.org/shemminger/prototypes/mii-tool.tar.bz2
with verbose register patch from Dean Gaudet
2003-06-28 00:19 ecki
* mii.h: Use new style MII ioctls only. This will give you a
warning, if compiled with old kernel source tree. It will also
not work if compiled with new source on old kernels. The new
ioctls also require root for reading, the old didnt. This fixes
Debian bug #133648. No fallback compatibility is included for
reasons of cleaner source.
2002-03-04 21:47 ecki
* interface.h: export procnetdev_version, get_dev_fields, get_name
from lib/interface.c for general usage (e.g. in my next patch to
iptunnel)
2001-11-25 03:48 ecki
* interface.h: this fixes Debian Bug #109164 (netstat -ci does only
print stats once). It also renames add_interface and
free_interface list to if_cache_add/free. I am not sure if
removing the "proc_read" flag will harm performance, looks likt
this check is never triggereed. Anyway, we need more efficient
b-search sooner or later.
--- net-tools-1.60.orig/include/util-ank.h
+++ net-tools-1.60/include/util-ank.h
@@ -75,6 +75,6 @@
extern int do_class(int argc, char **argv);
extern int do_filter(int argc, char **argv);
-extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
+extern const char *format_host(int af, void *addr, char *abuf, int alen);
#endif /* __UTILS_H__ */
--- net-tools-1.60.orig/include/mii.h
+++ net-tools-1.60/include/mii.h
@@ -6,11 +6,14 @@
* Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
*/
-#ifndef _LINUX_MII_H
-#define _LINUX_MII_H
+#ifndef _NETTOOL_MII_H
+#define _NETTOOLS_MII_H
+
+#include <linux/sockios.h>
/* network interface ioctl's for MII commands */
#ifndef SIOCGMIIPHY
+#warning "SIOCGMIIPHY is not defined by your kernel source"
#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */
#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */
#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */
@@ -38,6 +41,7 @@
#define MII_BMCR_RESTART 0x0200
#define MII_BMCR_DUPLEX 0x0100
#define MII_BMCR_COLTEST 0x0080
+#define MII_BMCR_SPEED1000 0x0040
/* Basic Mode Status Register */
#define MII_BMSR 0x01
@@ -83,4 +87,17 @@
#define MII_ANER_PAGE_RX 0x0002
#define MII_ANER_LP_AN_ABLE 0x0001
-#endif /* _LINUX_MII_H */
+#define MII_CTRL1000 0x09
+#define MII_BMCR2_1000FULL 0x0200
+#define MII_BMCR2_1000HALF 0x0100
+
+#define MII_STAT1000 0x0a
+#define MII_LPA2_1000LOCALOK 0x2000
+#define MII_LPA2_1000REMRXOK 0x1000
+#define MII_LPA2_1000FULL 0x0800
+#define MII_LPA2_1000HALF 0x0400
+
+/* Last register we need for show_basic_mii() */
+#define MII_BASIC_MAX (MII_STAT1000+1)
+
+#endif /* _NETTOOLS_MII_H */
--- net-tools-1.60.orig/include/interface.h
+++ net-tools-1.60/include/interface.h
@@ -64,13 +64,17 @@
extern int if_fetch(struct interface *ife);
extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
-extern int free_interface_list(void);
+extern int if_cache_free(void);
extern struct interface *lookup_interface(char *name);
extern int if_readlist(void);
extern int do_if_fetch(struct interface *ife);
extern int do_if_print(struct interface *ife, void *cookie);
+extern int procnetdev_version(char *buf);
+extern int get_dev_fields(char *bp, struct interface *ife);
+extern char * get_name(char *name, char *p);
+
extern void ife_print(struct interface *ptr);
extern int ife_short;
Patch by Jochen Voss, already applied in upstream CVS. (Bug #392263)
Index: net-tools/ipmaddr.c
===================================================================
--- net-tools.orig/ipmaddr.c
+++ net-tools/ipmaddr.c
@@ -291,13 +291,15 @@ static void print_mlist(FILE *fp, struct
static int multiaddr_list(int argc, char **argv)
{
struct ma_info *list = NULL;
+ size_t l;
while (argc > 0) {
if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
- if (filter_dev[0])
+ l = strlen(*argv);
+ if (l <= 0 || l >= sizeof(filter_dev))
usage();
- strcpy(filter_dev, *argv);
+ strncpy(filter_dev, *argv, sizeof (filter_dev));
} else if (strcmp(*argv, "all") == 0) {
filter_family = AF_UNSPEC;
} else if (strcmp(*argv, "ipv4") == 0) {
@@ -307,9 +309,10 @@ static int multiaddr_list(int argc, char
} else if (strcmp(*argv, "link") == 0) {
filter_family = AF_PACKET;
} else {
- if (filter_dev[0])
+ l = strlen(*argv);
+ if (l <= 0 || l >= sizeof(filter_dev))
usage();
- strcpy(filter_dev, *argv);
+ strncpy(filter_dev, *argv, sizeof (filter_dev));
}
argv++; argc--;
}
This diff is collapsed.
Sync with upstream CVS, complete log:
Revision 1.9 - Sun Dec 2 02:19:52 2007 UTC by ecki
more backoff
Revision 1.8 - Sat Dec 1 19:36:55 2007 UTC by ecki
backoff proc_fopen usage from etherfile.
Revision 1.7 - Sat Dec 1 18:51:09 2007 UTC by ecki
Page aligned fopen buffer
Index: net-tools/rarp.c
===================================================================
--- net-tools.orig/rarp.c
+++ net-tools/rarp.c
@@ -3,7 +3,7 @@
* that maintains the kernel's RARP cache. It is derived
* from Fred N. van Kempen's arp command.
*
- * Version: $Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
+ * Version: $Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
*
* Usage: rarp -d hostname Delete entry
* rarp -s hostname ethernet_address Add entry
@@ -40,6 +40,7 @@
#include "net-support.h"
#include "version.h"
#include "pathnames.h"
+#include "proc.h"
static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char
static int display_cache(void)
{
- FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
+ FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
char buffer[256];
if (fd == NULL) {
if (errno == ENOENT)
This diff is collapsed.
This diff is collapsed.
Sync with upstream CVS, complete log:
Revision 1.24 - Fri Oct 3 02:09:57 2008 UTC by ecki
moved H suport for Infiniband to the right section
Revision 1.23 - Fri Oct 3 01:55:07 2008 UTC by ecki
Add hardware support for InfiniBand (Debian Bug #294252 Tom Duffy from Sun).
Revision 1.22 - Fri Jun 4 00:06:50 2004 UTC by ecki
default all options which work with recent systems to on
Revision 1.21 - Mon Nov 12 02:12:05 2001 UTC by ecki
added EUI64 Hardware Address Family
Daniel Stodden <stodden@in.tum.de>
Index: net-tools/config.in
===================================================================
--- net-tools.orig/config.in
+++ net-tools/config.in
@@ -49,16 +49,16 @@ bool 'Does your system support GNU gette
*
bool 'UNIX protocol family' HAVE_AFUNIX y
bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
-bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
bool 'Appletalk DDP protocol family' HAVE_AFATALK y
bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
-bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
-bool 'Econet protocol family' HAVE_AFECONET n
+bool 'Econet protocol family' HAVE_AFECONET y
bool 'DECnet protocol family' HAVE_AFDECnet n
-bool 'Ash protocol family' HAVE_AFASH n
+bool 'Ash protocol family' HAVE_AFASH y
*
*
* Device Hardware types.
@@ -71,21 +71,23 @@ bool 'IPIP Tunnel support' HAVE_HWTUNNEL
bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
bool 'Token ring (generic) support' HAVE_HWTR y
bool 'AX25 (packet radio) support' HAVE_HWAX25 y
-bool 'Rose (packet radio) support' HAVE_HWROSE n
+bool 'Rose (packet radio) support' HAVE_HWROSE y
bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
bool 'X.25 (generic) support' HAVE_HWX25 y
bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
-bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
-bool 'FDDI (generic) support' HAVE_HWFDDI n
-bool 'HIPPI (generic) support' HAVE_HWHIPPI n
-bool 'Ash hardware support' HAVE_HWASH n
-bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
+bool 'FDDI (generic) support' HAVE_HWFDDI y
+bool 'HIPPI (generic) support' HAVE_HWHIPPI y
+bool 'Ash hardware support' HAVE_HWASH y
+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
bool 'IrDA support' HAVE_HWIRDA y
-bool 'Econet hardware support' HAVE_HWEC n
+bool 'Econet hardware support' HAVE_HWEC y
+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
+bool 'InfiniBand hardware support' HAVE_HWIB y
*
*
* Other Features.
*
-bool 'IP Masquerading support' HAVE_FW_MASQUERADE n