From 2c75ca1efb26304f7cec77d1b6e084664b75e772 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 19 Jan 2012 15:17:47 +0100 Subject: [PATCH] SELinux patch merged upstream several page fixes merged upstream mark localized man pages with %lang --- .gitignore | 1 + net-tools-1.60-cycle.patch | 44 +++--- net-tools-1.60-interface.patch | 26 ++-- net-tools-1.60-man.patch | 274 ++++++++------------------------- net-tools-1.60-selinux.patch | 235 ---------------------------- net-tools.spec | 30 ++-- sources | 2 +- 7 files changed, 118 insertions(+), 494 deletions(-) delete mode 100644 net-tools-1.60-selinux.patch diff --git a/.gitignore b/.gitignore index c35c46a..d9c8fcc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ net-tools-1.60.tar.bz2 /net-tools-1.60.20111207git.tar.xz /net-tools-1.60.20120105git.tar.xz /net-tools-1.60.20120111git.tar.xz +/net-tools-1.60.20120119git.tar.xz diff --git a/net-tools-1.60-cycle.patch b/net-tools-1.60-cycle.patch index e98490c..cc3a681 100644 --- a/net-tools-1.60-cycle.patch +++ b/net-tools-1.60-cycle.patch @@ -1,6 +1,6 @@ diff -up net-tools-1.60/lib/interface.c.cycle net-tools-1.60/lib/interface.c ---- net-tools-1.60/lib/interface.c.cycle 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/lib/interface.c 2012-01-05 12:46:55.872634104 +0100 +--- net-tools-1.60/lib/interface.c.cycle 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/lib/interface.c 2012-01-19 11:42:51.207536052 +0100 @@ -93,6 +93,7 @@ int if_list_all = 0; /* do we have reque static struct interface *int_list, *int_last; @@ -68,8 +68,8 @@ diff -up net-tools-1.60/lib/interface.c.cycle net-tools-1.60/lib/interface.c int if_readlist(void) { diff -up net-tools-1.60/man/en_US/netstat.8.cycle net-tools-1.60/man/en_US/netstat.8 ---- net-tools-1.60/man/en_US/netstat.8.cycle 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/man/en_US/netstat.8 2012-01-05 12:46:55.873634091 +0100 +--- net-tools-1.60/man/en_US/netstat.8.cycle 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/netstat.8 2012-01-19 11:42:51.208536039 +0100 @@ -33,6 +33,7 @@ netstat \- Print network connections, ro .RB [ \-\-verbose | \-v ] .RB [ \-\-continuous | \-c] @@ -129,9 +129,9 @@ diff -up net-tools-1.60/man/en_US/netstat.8.cycle net-tools-1.60/man/en_US/netst .SH OUTPUT .P diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c ---- net-tools-1.60/netstat.c.cycle 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/netstat.c 2012-01-05 12:49:42.611549580 +0100 -@@ -110,9 +110,9 @@ +--- net-tools-1.60/netstat.c.cycle 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/netstat.c 2012-01-19 11:49:59.836177456 +0100 +@@ -116,9 +116,9 @@ #endif /* prototypes for statistics.c */ @@ -143,8 +143,8 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c void inittab6(void); typedef enum { -@@ -308,10 +308,10 @@ static void prg_cache_clear(void) - prg_cache_loaded=0; +@@ -344,10 +344,10 @@ static void prg_cache_clear(void) + prg_cache_loaded = 0; } -static void wait_continous(void) @@ -156,7 +156,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) { -@@ -1734,6 +1734,8 @@ static int rfcomm_info(void) +@@ -1785,6 +1785,8 @@ static int rfcomm_info(void) static int iface_info(void) { @@ -165,7 +165,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c if (skfd < 0) { if ((skfd = sockets_open(0)) < 0) { perror("socket"); -@@ -1743,20 +1745,21 @@ static int iface_info(void) +@@ -1794,20 +1796,21 @@ static int iface_info(void) } if (flag_exp < 2) { ife_short = 1; @@ -190,7 +190,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c return 0; } -@@ -1772,7 +1775,7 @@ static void usage(void) +@@ -1823,7 +1826,7 @@ static void usage(void) { fprintf(stderr, _("usage: netstat [-vWeenNcCF] [] -r netstat {-V|--version|-h|--help}\n")); fprintf(stderr, _(" netstat [-vWnNcaeol] [ ...]\n")); @@ -199,7 +199,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c fprintf(stderr, _(" -r, --route display routing table\n")); fprintf(stderr, _(" -i, --interfaces display interface table\n")); -@@ -1809,6 +1812,7 @@ int main +@@ -1861,6 +1864,7 @@ int main (int argc, char *argv[]) { int i; int lop; @@ -207,7 +207,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c static struct option longopts[] = { AFTRANS_OPTS, -@@ -1976,6 +1980,12 @@ int main +@@ -2043,6 +2047,12 @@ int main flag_sta++; } @@ -220,7 +220,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c if (flag_int + flag_rou + flag_mas + flag_sta > 1) usage(); -@@ -2005,7 +2015,7 @@ int main +@@ -2072,7 +2082,7 @@ int main flag_not & FLAG_NUM_PORT, flag_exp); if (i || !flag_cnt) break; @@ -229,7 +229,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } #else ENOSUPP("netstat", "FW_MASQUERADE"); -@@ -2017,18 +2027,18 @@ int main +@@ -2084,18 +2094,18 @@ int main if (flag_sta) { if (!afname[0]) strcpy(afname, DFLT_AF); @@ -251,7 +251,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c #else ENOSUPP("netstat", "AF INET6"); #endif -@@ -2036,7 +2046,11 @@ int main +@@ -2103,7 +2113,11 @@ int main printf(_("netstat: No statistics support for specified address family: %s\n"), afname); exit(1); } @@ -264,7 +264,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } if (flag_rou) { -@@ -2058,7 +2072,7 @@ int main +@@ -2125,7 +2139,7 @@ int main i = route_info(afname, options); if (i || !flag_cnt) break; @@ -273,7 +273,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } return (i); } -@@ -2067,7 +2081,7 @@ int main +@@ -2134,7 +2148,7 @@ int main i = iface_info(); if (!flag_cnt || i) break; @@ -282,7 +282,7 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } return (i); } -@@ -2253,7 +2267,7 @@ int main +@@ -2321,7 +2335,7 @@ int main if (!flag_cnt || i) break; @@ -292,8 +292,8 @@ diff -up net-tools-1.60/netstat.c.cycle net-tools-1.60/netstat.c } return (i); diff -up net-tools-1.60/statistics.c.cycle net-tools-1.60/statistics.c ---- net-tools-1.60/statistics.c.cycle 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/statistics.c 2012-01-05 12:46:55.877634040 +0100 +--- net-tools-1.60/statistics.c.cycle 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/statistics.c 2012-01-19 11:42:51.220535890 +0100 @@ -502,7 +502,7 @@ void process6_fd(FILE *f) } diff --git a/net-tools-1.60-interface.patch b/net-tools-1.60-interface.patch index 0fa568b..8bc15d0 100644 --- a/net-tools-1.60-interface.patch +++ b/net-tools-1.60-interface.patch @@ -1,6 +1,6 @@ diff -up net-tools-1.60/man/en_US/netstat.8.interface net-tools-1.60/man/en_US/netstat.8 ---- net-tools-1.60/man/en_US/netstat.8.interface 2011-12-07 16:13:46.800161134 +0100 -+++ net-tools-1.60/man/en_US/netstat.8 2011-12-07 16:13:46.807161046 +0100 +--- net-tools-1.60/man/en_US/netstat.8.interface 2012-01-19 15:11:22.176127422 +0100 ++++ net-tools-1.60/man/en_US/netstat.8 2012-01-19 15:11:22.182127345 +0100 @@ -46,9 +46,9 @@ netstat \- Print network connections, ro .RB [delay] .P @@ -25,9 +25,9 @@ diff -up net-tools-1.60/man/en_US/netstat.8.interface net-tools-1.60/man/en_US/n Display a list of masqueraded connections. .SS "\-\-statistics , \-s" diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c ---- net-tools-1.60/netstat.c.interface 2011-12-07 16:13:46.787161296 +0100 -+++ net-tools-1.60/netstat.c 2011-12-07 16:14:41.331479399 +0100 -@@ -135,6 +135,7 @@ char *Release = RELEASE, *Version = "net +--- net-tools-1.60/netstat.c.interface 2012-01-19 15:11:22.163127584 +0100 ++++ net-tools-1.60/netstat.c 2012-01-19 15:12:16.094453349 +0100 +@@ -145,6 +145,7 @@ char *Release = RELEASE, *Version = "net #define E_IOCTL -3 int flag_int = 0; @@ -35,7 +35,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c int flag_rou = 0; int flag_mas = 0; int flag_sta = 0; -@@ -1611,6 +1612,7 @@ static int ipx_info(void) +@@ -1786,6 +1787,7 @@ static int rfcomm_info(void) static int iface_info(void) { static int count=0; @@ -43,7 +43,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c if (skfd < 0) { if ((skfd = sockets_open(0)) < 0) { -@@ -1625,7 +1627,11 @@ static int iface_info(void) +@@ -1800,7 +1802,11 @@ static int iface_info(void) printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); } @@ -56,7 +56,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c perror(_("missing interface information")); exit(1); } -@@ -1651,9 +1657,10 @@ static void usage(void) +@@ -1826,9 +1832,10 @@ static void usage(void) { fprintf(stderr, _("usage: netstat [-vWeenNcCF] [] -r netstat {-V|--version|-h|--help}\n")); fprintf(stderr, _(" netstat [-vWnNcaeol] [ ...]\n")); @@ -68,7 +68,7 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c fprintf(stderr, _(" -i, --interfaces display interface table\n")); fprintf(stderr, _(" -g, --groups display multicast group memberships\n")); fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n")); -@@ -1693,7 +1700,7 @@ int main +@@ -1869,7 +1876,7 @@ int main { AFTRANS_OPTS, {"version", 0, 0, 'V'}, @@ -77,16 +77,16 @@ diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c {"help", 0, 0, 'h'}, {"route", 0, 0, 'r'}, #if HAVE_FW_MASQUERADE -@@ -1734,7 +1741,7 @@ int main +@@ -1913,7 +1920,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?", longopts, &lop)) != EOF) +- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) switch (i) { case -1: break; -@@ -1775,6 +1782,13 @@ int main +@@ -1954,6 +1961,13 @@ int main case 'p': flag_prg++; break; diff --git a/net-tools-1.60-man.patch b/net-tools-1.60-man.patch index dcf379c..5fafaa5 100644 --- a/net-tools-1.60-man.patch +++ b/net-tools-1.60-man.patch @@ -1,22 +1,7 @@ diff -up net-tools-1.60/man/de_DE/arp.8.man net-tools-1.60/man/de_DE/arp.8 ---- net-tools-1.60/man/de_DE/arp.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/de_DE/arp.8 2011-12-06 13:38:28.094531727 +0100 -@@ -120,11 +120,9 @@ Flagge) kann - .B Netmaske - f\(:ur ARP-Eintr\(:age f\(:ur ganze Subnetze angegeben werde. Von dieser - Praxis wird abgeraten. Sie wird von \(:alteren Kerneln unterst\(:utzt, da --sie gelegentlich n\(:utzlich ist. Wird die --If the --.B temp --Flagge nicht angegeben, so werden die erzeugten Eintr\(:age nicht dauerhaft --in den ARP-Cache eingetragen. -+sie gelegentlich n\(:utzlich ist. -+Der Eintrag wird permanent im ARP-Cache gespeichert, -+wenn das \fBtemp\fR-Flag nicht angegeben wird. - .br - .B ANMERKUNG: - Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur -@@ -176,8 +174,10 @@ Flagge. +--- net-tools-1.60/man/de_DE/arp.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/de_DE/arp.8 2012-01-19 15:15:09.084290679 +0100 +@@ -174,8 +174,10 @@ Flagge. .I /etc/hosts .br .I /etc/ethers @@ -29,47 +14,28 @@ diff -up net-tools-1.60/man/de_DE/arp.8.man net-tools-1.60/man/de_DE/arp.8 Fred N. van Kempen, mit vielen Verbesserungen vom Verwalter der Net-Tools Bernd Eckenfels . diff -up net-tools-1.60/man/de_DE/ifconfig.8.man net-tools-1.60/man/de_DE/ifconfig.8 ---- net-tools-1.60/man/de_DE/ifconfig.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/de_DE/ifconfig.8 2011-12-06 13:38:28.094531727 +0100 -@@ -180,20 +180,21 @@ Seit Kernel Version 2.2 gibt es keine ex - Schnittstellenaliase mehr. Die Statistiken f\(:ur die Originaladresse werden - mit allen Aliasen auf das gleiche Ger\(:at geteilt. Um Statistiken per - Adresse zu erhalten sollte explizite EIntr\(:age f\(:ur die Adresse mit dem --.BR ipchains(8) -+.BR iptables(8) - Kommando gemacht werden. - - .SH DATEIEN --.I /proc/net/socket --.br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 - .SH FEHLER +--- net-tools-1.60/man/de_DE/ifconfig.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/de_DE/ifconfig.8 2012-01-19 15:15:09.085290666 +0100 +@@ -191,7 +191,8 @@ Kommando gemacht werden. W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit diesem Kommando nicht ge\(:andert werden. -+ .SH SIEHE AUCH --route(8), netstat(8), arp(8), rarp(8), ipchains(8) +-route(8), netstat(8), arp(8), rarp(8), iptables(8) +.BR ip(8), +.BR iptables(8) -+ .SH AUTOREN Fred N. van Kempen, .br diff -up net-tools-1.60/man/de_DE/netstat.8.man net-tools-1.60/man/de_DE/netstat.8 ---- net-tools-1.60/man/de_DE/netstat.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/de_DE/netstat.8 2011-12-06 13:38:28.142531127 +0100 -@@ -475,12 +475,9 @@ Befehl explizite Regeln zugef\(:ugt werd +--- net-tools-1.60/man/de_DE/netstat.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/de_DE/netstat.8 2012-01-19 15:15:09.085290666 +0100 +@@ -475,9 +475,9 @@ Befehl explizite Regeln zugef\(:ugt werd .PP .SH SIEHE AUCH -.BR route (8), -.BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) +-.BR iptables (8) +.BR ss(8), +.BR ip(8), +.BR iptables(8) @@ -77,8 +43,8 @@ diff -up net-tools-1.60/man/de_DE/netstat.8.man net-tools-1.60/man/de_DE/netstat .PP .SH PROBLEME diff -up net-tools-1.60/man/de_DE/route.8.man net-tools-1.60/man/de_DE/route.8 ---- net-tools-1.60/man/de_DE/route.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/de_DE/route.8 2011-12-06 13:38:28.201530389 +0100 +--- net-tools-1.60/man/de_DE/route.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/de_DE/route.8 2012-01-19 15:15:09.086290653 +0100 @@ -334,7 +334,7 @@ Nur wenn die Hardwareadresse f\(:ur die .I /proc/net/rt_cache .LP @@ -89,8 +55,8 @@ diff -up net-tools-1.60/man/de_DE/route.8.man net-tools-1.60/man/de_DE/route.8 .SH GESCHICHTE .B Route diff -up net-tools-1.60/man/en_US/arp.8.man net-tools-1.60/man/en_US/arp.8 ---- net-tools-1.60/man/en_US/arp.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/arp.8 2011-12-06 13:38:28.251529764 +0100 +--- net-tools-1.60/man/en_US/arp.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/arp.8 2012-01-19 15:15:09.086290653 +0100 @@ -63,6 +63,10 @@ arp \- manipulate the system ARP cache .B \-f .RI [ filename ] @@ -102,17 +68,6 @@ diff -up net-tools-1.60/man/en_US/arp.8.man net-tools-1.60/man/en_US/arp.8 .SH DESCRIPTION .B Arp manipulates or displays the kernel's IPv4 network neighbour cache. It can add -@@ -178,8 +182,8 @@ but this is not official. If no filename - is used as default. - .sp 1 - The format of the file is simple; it --only contains ASCII text lines with a hostname, and a hardware --address separated by whitespace. Additionally the -+only contains ASCII text lines with a hardware -+address and a hostname separated by whitespace. Additionally the - .BR "pub" , " temp" " and" " netmask" - flags can be used. - .LP @@ -218,6 +222,6 @@ published proxy ARP entries and permanen .br .I /etc/ethers @@ -122,8 +77,8 @@ diff -up net-tools-1.60/man/en_US/arp.8.man net-tools-1.60/man/en_US/arp.8 .SH AUTHORS Fred N. van Kempen , Bernd Eckenfels . diff -up net-tools-1.60/man/en_US/ethers.5.man net-tools-1.60/man/en_US/ethers.5 ---- net-tools-1.60/man/en_US/ethers.5.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/ethers.5 2011-12-06 13:38:28.301529135 +0100 +--- net-tools-1.60/man/en_US/ethers.5.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/ethers.5 2012-01-19 15:15:09.087290640 +0100 @@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate .SH FILES \"{{{ /etc/ethers @@ -132,8 +87,8 @@ diff -up net-tools-1.60/man/en_US/ethers.5.man net-tools-1.60/man/en_US/ethers.5 -rarp(8) -.\"}}} diff -up net-tools-1.60/man/en_US/ifconfig.8.man net-tools-1.60/man/en_US/ifconfig.8 ---- net-tools-1.60/man/en_US/ifconfig.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/ifconfig.8 2011-12-06 13:39:00.576125653 +0100 +--- net-tools-1.60/man/en_US/ifconfig.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/ifconfig.8 2012-01-19 15:15:09.087290640 +0100 @@ -5,6 +5,13 @@ ifconfig \- configure a network interfac .B "ifconfig [-v] [-a] [-s] [interface]" .br @@ -148,54 +103,31 @@ diff -up net-tools-1.60/man/en_US/ifconfig.8.man net-tools-1.60/man/en_US/ifconf .SH DESCRIPTION .B Ifconfig is used to configure the kernel-resident network interfaces. It is -@@ -39,6 +46,11 @@ supported address families include - (Novell IPX) and - .B netrom - (AMPR Packet radio). -+All numbers supplied as parts in IPv4 dotted decimal notation may be decimal, -+octal, or hexadecimal, as specified in the ISO C standard (that is, a leading 0x -+or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise, -+the number is interpreted as decimal). Use of hexadecimal and octal numbers -+is not RFC-compliant and therefore its use is discouraged and may go away. - .SH OPTIONS - .TP - .B -a -@@ -205,8 +217,6 @@ it is most likely a interrupt conflict. - .I http://www.scyld.com/expert/irq\-conflict.html - for more information. - .SH FILES --.I /proc/net/socket --.br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 -@@ -214,7 +224,8 @@ for more information. +@@ -225,7 +232,8 @@ package to display link layer informatio While appletalk DDP and IPX addresses will be displayed they cannot be altered by this command. .SH SEE ALSO --route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). +-route(8), netstat(8), arp(8), rarp(8), iptables(8), ifup(8), interfaces(5). +.BR ip(8), +.BR iptables(8) .br http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples .SH AUTHORS diff -up net-tools-1.60/man/en_US/mii-tool.8.man net-tools-1.60/man/en_US/mii-tool.8 ---- net-tools-1.60/man/en_US/mii-tool.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/mii-tool.8 2011-12-06 13:38:28.400527901 +0100 -@@ -18,6 +18,12 @@ mii\-tool \- view, manipulate media-inde +--- net-tools-1.60/man/en_US/mii-tool.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/mii-tool.8 2012-01-19 15:15:09.087290640 +0100 +@@ -18,6 +18,10 @@ mii\-tool \- view, manipulate media-inde [\fB\-F\fR, \fB\-\-force=\fImedia\fR] .RI "interface\ ..." +.SH NOTE +.P -+This program is obsolete. Valid media are only \fB100baseT4\fR, -+\fB100baseTx-FD\fR,\fB100baseTx-HD\fR, \fB10baseT-FD\fR and -+\fB10baseT-HD\fR ethernet cards. For replacement check \fBethtool\fB. ++This program is obsolete. For replacement check \fBethtool\fB. + .SH DESCRIPTION This utility checks or sets the status of a network interface's Media Independent Interface (MII) unit. Most fast ethernet adapters use an -@@ -87,6 +93,9 @@ SIOCGMIIPHY on 'eth?' failed: Operation +@@ -85,6 +89,9 @@ SIOCGMIIPHY on 'eth?' failed: Operation The interface in question does not support MII queries. Most likely, it does not have MII transceivers, at all. @@ -206,8 +138,8 @@ diff -up net-tools-1.60/man/en_US/mii-tool.8.man net-tools-1.60/man/en_US/mii-to David Hinds \- dhinds@pcmcia.sourceforge.org .br diff -up net-tools-1.60/man/en_US/nameif.8.man net-tools-1.60/man/en_US/nameif.8 ---- net-tools-1.60/man/en_US/nameif.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/nameif.8 2011-12-06 13:38:28.451527263 +0100 +--- net-tools-1.60/man/en_US/nameif.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/nameif.8 2012-01-19 15:15:09.088290628 +0100 @@ -5,6 +5,12 @@ nameif \- name network interfaces based .B "nameif [\-c configfile] [\-s]" .br @@ -233,8 +165,8 @@ diff -up net-tools-1.60/man/en_US/nameif.8.man net-tools-1.60/man/en_US/nameif.8 .SH BUGS Only works for Ethernet currently. diff -up net-tools-1.60/man/en_US/netstat.8.man net-tools-1.60/man/en_US/netstat.8 ---- net-tools-1.60/man/en_US/netstat.8.man 2011-12-06 13:38:27.771535767 +0100 -+++ net-tools-1.60/man/en_US/netstat.8 2011-12-06 13:38:28.509526538 +0100 +--- net-tools-1.60/man/en_US/netstat.8.man 2012-01-19 15:15:09.066290903 +0100 ++++ net-tools-1.60/man/en_US/netstat.8 2012-01-19 15:15:09.088290628 +0100 @@ -101,6 +101,14 @@ netstat \- Print network connections, ro .RB [ \-\-ddp | \-\-appletalk ] .RB [ \-\-econet | \-\-ec ] @@ -260,24 +192,22 @@ diff -up net-tools-1.60/man/en_US/netstat.8.man net-tools-1.60/man/en_US/netstat .B \-\-interfaces option, show interfaces that are not up .SS "\-F" -@@ -458,11 +467,9 @@ status information via the following fil +@@ -458,9 +467,9 @@ status information via the following fil .fi .P .SH SEE ALSO -.BR route (8), -.BR ifconfig (8), --.BR ipchains (8), -.BR iptables (8), --.BR proc (5) +.BR ss(8), +.BR ip(8), -+.BR iptables(8) ++.BR iptables(8), + .BR proc (5) .P .SH BUGS - Occasionally strange information may appear if a socket changes diff -up net-tools-1.60/man/en_US/route.8.man net-tools-1.60/man/en_US/route.8 ---- net-tools-1.60/man/en_US/route.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/en_US/route.8 2011-12-06 13:38:28.559525913 +0100 +--- net-tools-1.60/man/en_US/route.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/en_US/route.8 2012-01-19 15:15:09.089290616 +0100 @@ -52,6 +52,11 @@ If] .RB [ \-\-version ] .RB [ \-h ] @@ -290,23 +220,7 @@ diff -up net-tools-1.60/man/en_US/route.8.man net-tools-1.60/man/en_US/route.8 .SH DESCRIPTION .B Route manipulates the kernel's IP routing tables. Its primary use is to set -@@ -138,12 +143,9 @@ compatibility hack. - set the metric field in the routing table (used by routing daemons) to M. - .TP - .B mss M --set the TCP Maximum Segment Size (MSS) for connections over this route --to M bytes. --The default is the device MTU minus headers, or a lower MTU when path mtu --discovery occurred. This setting can be used to force smaller TCP packets on the --other end when path mtu discovery does not work (usually because of --misconfigured firewalls that block ICMP Fragmentation Needed) -+sets MTU (Maximum Transmission Unit) of the route to M bytes. -+Note that the current implementation of the route command does not allow -+the option to set the Maximum Segment Size (MSS). - .TP - .B window W - set the TCP window size for connections over this route to W -@@ -317,7 +319,7 @@ Whether or not the hardware address for +@@ -314,7 +319,7 @@ Whether or not the hardware address for .I /proc/net/rt_cache .LP .SH SEE ALSO @@ -316,57 +230,36 @@ diff -up net-tools-1.60/man/en_US/route.8.man net-tools-1.60/man/en_US/route.8 .SH HISTORY .B Route diff -up net-tools-1.60/man/fr_FR/ifconfig.8.man net-tools-1.60/man/fr_FR/ifconfig.8 ---- net-tools-1.60/man/fr_FR/ifconfig.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/fr_FR/ifconfig.8 2011-12-06 13:38:28.609525290 +0100 -@@ -183,20 +183,21 @@ pour les interfaces en alias. Les statis - adresse sont partagées avec toutes les adresses alias du même périphérique. - Si vous voulez des adresses par interface, vous devez ajouter des règles de - comptabilité particulières pour l'adresse en utilisant la commande --.BR ipchains(8) -+.BR iptables(8) - . - - .SH FICHIERS --.I /proc/net/socket --.br - .I /proc/net/dev - .br - .I /proc/net/if_inet6 - .SH BUGS - Même si les adresses appletalk DDP et IPX peuvent être affichées, - elles ne peuvent être modifiées avec cette commande. -+ +--- net-tools-1.60/man/fr_FR/ifconfig.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/fr_FR/ifconfig.8 2012-01-19 15:15:09.089290616 +0100 +@@ -194,7 +194,8 @@ comptabilité particulières pour l'adre + Même si les adresses appletalk DDP et IPX peuvent être affichées, + elles ne peuvent être modifiées avec cette commande. .SH VOIR AUSSI --route(8), netstat(8), arp(8), rarp(8), ipchains(8) +-route(8), netstat(8), arp(8), rarp(8), iptables(8) +.BR ip(8), +.BR iptables(8) -+ .SH AUTHORS Fred N. van Kempen, .br diff -up net-tools-1.60/man/fr_FR/netstat.8.man net-tools-1.60/man/fr_FR/netstat.8 ---- net-tools-1.60/man/fr_FR/netstat.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/fr_FR/netstat.8 2011-12-06 13:38:28.651524763 +0100 -@@ -468,12 +468,9 @@ devez définir des règles spécifiques à l +--- net-tools-1.60/man/fr_FR/netstat.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/fr_FR/netstat.8 2012-01-19 15:15:49.834781228 +0100 +@@ -468,8 +468,8 @@ devez définir des règles spécifiques .PP .SH VOIR AUSSI -.BR route (8), -.BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) -+.BR ss(8), -+.BR ip(8), -+.BR iptables(8) ++.BR ss (8), ++.BR ip (8), + .BR iptables (8) .PP - .SH BUGS diff -up net-tools-1.60/man/fr_FR/route.8.man net-tools-1.60/man/fr_FR/route.8 ---- net-tools-1.60/man/fr_FR/route.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/fr_FR/route.8 2011-12-06 13:38:28.701524138 +0100 -@@ -320,7 +320,7 @@ Indique si oui ou non l'adresse matériel +--- net-tools-1.60/man/fr_FR/route.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/fr_FR/route.8 2012-01-19 15:15:09.090290604 +0100 +@@ -320,7 +320,7 @@ à jour. .I /proc/net/rt_cache .LP .SH VOIR AUSSI @@ -376,61 +269,28 @@ diff -up net-tools-1.60/man/fr_FR/route.8.man net-tools-1.60/man/fr_FR/route.8 .SH HISTORIQUE .B Route diff -up net-tools-1.60/man/pt_BR/ifconfig.8.man net-tools-1.60/man/pt_BR/ifconfig.8 ---- net-tools-1.60/man/pt_BR/ifconfig.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/pt_BR/ifconfig.8 2011-12-06 13:38:28.759523414 +0100 -@@ -144,32 +144,26 @@ O nome ou endereço IP da máquina (um nom - um endereço IP) da interface. Este parâmetro é necessário, apesar - da sintaxe atualmente não requisitá-lo. - .SH NOTAS -- --+Since kernel release 2.2 there are no explicit interface statistics for --+alias interfaces anymore. The statistics printed for the original address --+are shared with all alias addresses on the same device. If you want per-address --+statistics you should add explicit accounting --+rules for the address using the --+.BR ipchains(8) --+command. -- - Deste o kernel 2.2 não existem mais estatísticas explícitas para os apelidos (aliases) - de interfaces. As estatísticas mostradas para o endereço original são compartilhadas - como todos os endereços associados ao mesmo dispositivo. Se desejar estatísticas - por endereço você deve explicitamente adicionar regras de contabilização para os - endereços usando o comando --.BR ipchains(8) -+.BR iptables(8) - . - - .SH ARQUIVOS --.I /proc/net/socket --.br - .I /proc/net/dev -+.br -+.I /proc/net/if_inet6 - .SH BUGS - Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados +--- net-tools-1.60/man/pt_BR/ifconfig.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/pt_BR/ifconfig.8 2012-01-19 15:15:09.090290604 +0100 +@@ -158,7 +158,8 @@ endereços usando o comando + Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados com este comando. -+ - .SH VEJA TAMBÉM --route(8), netstat(8), arp(8), rarp(8), ipchains(8) + .SH VEJA TAMBÉM +-route(8), netstat(8), arp(8), rarp(8), iptables(8) +.BR ip(8), +.BR iptables(8) -+ .SH AUTORES Fred N. van Kempen, Alan Cox, diff -up net-tools-1.60/man/pt_BR/netstat.8.man net-tools-1.60/man/pt_BR/netstat.8 ---- net-tools-1.60/man/pt_BR/netstat.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/pt_BR/netstat.8 2011-12-06 13:38:28.800522902 +0100 -@@ -434,12 +434,9 @@ configurar regras explícitas usando o co +--- net-tools-1.60/man/pt_BR/netstat.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/pt_BR/netstat.8 2012-01-19 15:15:09.091290592 +0100 +@@ -434,9 +434,9 @@ configurar regras explícitas usando o c .PP - .SH VEJA TAMBÉM + .SH VEJA TAMBÉM -.BR route (8), -.BR ifconfig (8), --.BR ipfw (4), --.BR ipfw (8), --.BR ipfwadm (8) --.BR ipchains (8) +-.BR iptables (8) +.BR ss(8), +.BR ip(8), +.BR iptables(8) @@ -438,14 +298,14 @@ diff -up net-tools-1.60/man/pt_BR/netstat.8.man net-tools-1.60/man/pt_BR/netstat .PP .SH BUGS diff -up net-tools-1.60/man/pt_BR/route.8.man net-tools-1.60/man/pt_BR/route.8 ---- net-tools-1.60/man/pt_BR/route.8.man 2011-11-21 02:31:57.000000000 +0100 -+++ net-tools-1.60/man/pt_BR/route.8 2011-12-06 13:38:28.842522378 +0100 -@@ -312,7 +312,7 @@ parâmetros do protocolo TCP sem esperar +--- net-tools-1.60/man/pt_BR/route.8.man 2012-01-16 15:34:09.000000000 +0100 ++++ net-tools-1.60/man/pt_BR/route.8 2012-01-19 15:15:09.092290580 +0100 +@@ -312,7 +312,7 @@ parâmetros do protocolo TCP sem esperar .I /etc/init.d/network .LP - .SH VEJA TAMBÉM + .SH VEJA TAMBÉM -.I ifconfig(8), netstat(8), arp(8) +.BR ip(8) .LP - .SH HISTÓRICO + .SH HISTÓRICO .B Route diff --git a/net-tools-1.60-selinux.patch b/net-tools-1.60-selinux.patch deleted file mode 100644 index 8814302..0000000 --- a/net-tools-1.60-selinux.patch +++ /dev/null @@ -1,235 +0,0 @@ -diff -up net-tools-1.60/config.in.selinux net-tools-1.60/config.in ---- net-tools-1.60/config.in.selinux 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/config.in 2012-01-05 13:04:45.359263680 +0100 -@@ -92,3 +92,4 @@ bool 'InfiniBand hardware support' HAVE_ - bool 'IP Masquerading support' HAVE_FW_MASQUERADE y - bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y - bool 'Build mii-tool' HAVE_MII y -+bool 'SELinux support' HAVE_SELINUX n -diff -up net-tools-1.60/Makefile.selinux net-tools-1.60/Makefile ---- net-tools-1.60/Makefile.selinux 2012-01-05 12:22:43.000000000 +0100 -+++ net-tools-1.60/Makefile 2012-01-05 13:04:45.359263680 +0100 -@@ -114,6 +114,12 @@ endif - - NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a - -+ifeq ($(HAVE_SELINUX),1) -+LDFLAGS += -lselinux -+CFLAGS += -DHAVE_SELINUX -+else -+endif -+ - CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH) - LDFLAGS += -L$(NET_LIB_PATH) - -diff -up net-tools-1.60/netstat.c.selinux net-tools-1.60/netstat.c ---- net-tools-1.60/netstat.c.selinux 2012-01-05 13:04:45.315264230 +0100 -+++ net-tools-1.60/netstat.c 2012-01-05 13:05:42.368550965 +0100 -@@ -89,6 +89,11 @@ - #include - #include - -+#if HAVE_SELINUX -+#include -+#else -+#define security_context_t char* -+#endif - #include "net-support.h" - #include "pathnames.h" - #include "version.h" -@@ -104,6 +109,7 @@ - #endif - - #define PROGNAME_WIDTH 20 -+#define SELINUX_WIDTH 50 - - #if !defined(s6_addr32) && defined(in6a_words) - #define s6_addr32 in6a_words /* libinet6 */ -@@ -165,6 +171,7 @@ int flag_arg = 0; - int flag_ver = 0; - int flag_l2cap = 0; - int flag_rfcomm = 0; -+int flag_selinux = 0; - - FILE *procinfo; - -@@ -228,12 +235,17 @@ FILE *procinfo; - #define PROGNAME_WIDTH1(s) PROGNAME_WIDTH2(s) - #define PROGNAME_WIDTH2(s) #s - -+#define SELINUX_WIDTHs SELINUX_WIDTH1(SELINUX_WIDTH) -+#define SELINUX_WIDTH1(s) SELINUX_WIDTH2(s) -+#define SELINUX_WIDTH2(s) #s -+ - #define PRG_HASH_SIZE 211 - - static struct prg_node { - struct prg_node *next; - unsigned long inode; - char name[PROGNAME_WIDTH]; -+ char scon[SELINUX_WIDTH]; - } *prg_hash[PRG_HASH_SIZE]; - - static char prg_cache_loaded = 0; -@@ -241,9 +253,12 @@ static char prg_cache_loaded = 0; - #define PRG_HASHIT(x) ((x) % PRG_HASH_SIZE) - - #define PROGNAME_BANNER "PID/Program name" -+#define SELINUX_BANNER "Security Context" - - #define print_progname_banner() do { if (flag_prg) printf(" %-" PROGNAME_WIDTHs "s",PROGNAME_BANNER); } while (0) - -+#define print_selinux_banner() do { if (flag_selinux) printf("%-" SELINUX_WIDTHs "s"," " SELINUX_BANNER); } while (0) -+ - #define PRG_LOCAL_ADDRESS "local_address" - #define PRG_INODE "inode" - #define PRG_SOCKET_PFX "socket:[" -@@ -263,7 +278,7 @@ static char prg_cache_loaded = 0; - #define PATH_CMDLINE "cmdline" - #define PATH_CMDLINEl strlen(PATH_CMDLINE) - --static void prg_cache_add(unsigned long inode, char *name) -+static void prg_cache_add(unsigned long inode, char *name, char *scon) - { - unsigned hi = PRG_HASHIT(inode); - struct prg_node **pnp,*pn; -@@ -284,6 +299,14 @@ static void prg_cache_add(unsigned long - if (strlen(name)>sizeof(pn->name)-1) - name[sizeof(pn->name)-1]='\0'; - strcpy(pn->name,name); -+ -+ { -+ int len=(strlen(scon)-sizeof(pn->scon))+1; -+ if (len > 0) -+ strcpy(pn->scon,&scon[len+1]); -+ else -+ strcpy(pn->scon,scon); -+ } - } - - static const char *prg_cache_get(unsigned long inode) -@@ -296,6 +319,16 @@ static const char *prg_cache_get(unsigne - return("-"); - } - -+static const char *prg_cache_get_con(unsigned long inode) -+{ -+ unsigned hi=PRG_HASHIT(inode); -+ struct prg_node *pn; -+ -+ for (pn=prg_hash[hi];pn;pn=pn->next) -+ if (pn->inode==inode) return(pn->scon); -+ return("-"); -+} -+ - static void prg_cache_clear(void) - { - struct prg_node **pnp,*pn; -@@ -373,6 +406,7 @@ static void prg_cache_load(void) - const char *cs,*cmdlp; - DIR *dirproc=NULL,*dirfd=NULL; - struct dirent *direproc,*direfd; -+ security_context_t scon=NULL; - - if (prg_cache_loaded || !flag_prg) return; - prg_cache_loaded=1; -@@ -436,7 +470,15 @@ static void prg_cache_load(void) - } - - snprintf(finbuf, sizeof(finbuf), "%s/%s", direproc->d_name, cmdlp); -- prg_cache_add(inode, finbuf); -+#if HAVE_SELINUX -+ if (getpidcon(atoi(direproc->d_name), &scon) == -1) { -+ scon=strdup("-"); -+ } -+ prg_cache_add(inode, finbuf, scon); -+ freecon(scon); -+#else -+ prg_cache_add(inode, finbuf, "-"); -+#endif - } - closedir(dirfd); - dirfd = NULL; -@@ -672,6 +714,9 @@ static void finish_this_one(int uid, uns - } - if (flag_prg) - printf(" %-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); -+ if (flag_selinux) -+ printf(" %-" SELINUX_WIDTHs "s",prg_cache_get_con(inode)); -+ - if (flag_opt) - printf(" %s", timers); - putchar('\n'); -@@ -1495,7 +1540,9 @@ static void unix_do_one(int nr, const ch - printf("- "); - if (flag_prg) - printf(" %-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); -- -+ if (flag_selinux) -+ printf(" %-" SELINUX_WIDTHs "s",(has & HAS_INODE?prg_cache_get_con(inode):"-")); -+ - printf(" %s\n", path); - } - -@@ -1514,6 +1561,7 @@ static int unix_info(void) - - printf(_("\nProto RefCnt Flags Type State I-Node ")); - print_progname_banner(); -+ print_selinux_banner(); - printf(_(" Path\n")); /* xxx */ - - { -@@ -1927,6 +1975,7 @@ static void usage(void) - fprintf(stderr, _(" -o, --timers display timers\n")); - fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); -+ fprintf(stderr, _(" -Z, --context display SELinux security context for sockets\n\n")); - - fprintf(stderr, _(" ={-t|--tcp} {-u|--udp} {-U|--udplite} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); - fprintf(stderr, _(" =Use '-6|-4' or '-A ' or '--'; default: %s\n"), DFLT_AF); -@@ -1977,6 +2026,7 @@ int main - {"cache", 0, 0, 'C'}, - {"fib", 0, 0, 'F'}, - {"groups", 0, 0, 'g'}, -+ {"context", 0, 0, 'Z'}, - {NULL, 0, 0, 0} - }; - -@@ -1988,7 +2038,7 @@ int main - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -2108,6 +2158,20 @@ int main - if (aftrans_opt("unix")) - exit(1); - break; -+ case 'Z': -+#if HAVE_SELINUX -+ if (is_selinux_enabled() <= 0) { -+ fprintf(stderr, _("SELinux is not enabled on this machine.\n")); -+ exit(1); -+ } -+ flag_prg++; -+ flag_selinux++; -+#else -+ fprintf(stderr, _("SELinux is not enabled for this application.\n")); -+ exit(1); -+#endif -+ -+ break; - case '?': - case 'h': - usage(); -@@ -2238,6 +2302,7 @@ int main - if (flag_exp > 1) - printf(_(" User Inode ")); - print_progname_banner(); -+ print_selinux_banner(); - if (flag_opt) - printf(_(" Timer")); /* xxx */ - printf("\n"); diff --git a/net-tools.spec b/net-tools.spec index b2a2956..636c3cc 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%global checkout 20120111git +%global checkout 20120119git Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 132.%{checkout}%{?dist} +Release: 133.%{checkout}%{?dist} License: GPL+ Group: System Environment/Base URL: http://net-tools.sourceforge.net @@ -47,17 +47,14 @@ Patch8: net-tools-1.60-trim_iface.patch # clear static buffers in interface.c by Ulrich Drepper (#176714) Patch9: net-tools-1.60-interface_stack.patch -# new option for nestat, -Z shows selinux context -Patch10: net-tools-1.60-selinux.patch - # statistics for SCTP -Patch11: net-tools-1.60-sctp-statistics.patch +Patch10: net-tools-1.60-sctp-statistics.patch # ifconfig crash when interface name is too long (#190703) -Patch12: net-tools-1.60-ifconfig-long-iface-crasher.patch +Patch11: net-tools-1.60-ifconfig-long-iface-crasher.patch # fixed tcp timers info in netstat (#466845) -Patch13: net-tools-1.60-netstat-probe.patch +Patch12: net-tools-1.60-netstat-probe.patch BuildRequires: gettext, libselinux BuildRequires: libselinux-devel @@ -81,10 +78,9 @@ Most of them are obsolete. For replacement check iproute package. %patch7 -p1 -b .statalias %patch8 -p1 -b .trim-iface %patch9 -p1 -b .stack -%patch10 -p1 -b .selinux -%patch11 -p1 -b .sctp -%patch12 -p1 -b .long_iface -%patch13 -p1 -b .probe +%patch10 -p1 -b .sctp +%patch11 -p1 -b .long_iface +%patch12 -p1 -b .probe cp %SOURCE1 ./config.h cp %SOURCE2 ./config.make @@ -154,7 +150,7 @@ rm -rf %{buildroot}%{_mandir}/pt/man1 mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} -%find_lang %{name} +%find_lang %{name} --all-name --with-man %post # Initial installation @@ -178,12 +174,14 @@ fi /sbin/plipconfig /sbin/slattach %{_mandir}/man[58]/* -%lang(de) %{_mandir}/de/man[58]/* -%lang(fr) %{_mandir}/fr/man[58]/* -%lang(pt) %{_mandir}/pt/man[58]/* %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Thu Jan 19 2012 Jiri Popelka - 1.60-133.20120119git +- SELinux patch merged upstream +- several page fixes merged upstream +- mark localized man pages with %%lang + * Wed Jan 11 2012 Jiri Popelka - 1.60-132.20120111git - 3 patches merged upstream - removed 2digit.patch (#718610) diff --git a/sources b/sources index fb70990..dfb2c1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1a2cbcec244222ce8d21dbc180cd483 net-tools-1.60.20120111git.tar.xz +e5438dfa85e7a92b2561e00ad3af67dc net-tools-1.60.20120119git.tar.xz