From b249c042bd08d92979bb11e4f928ddfddb7ae01a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 18 Jul 2014 18:40:22 -0400 Subject: [PATCH 1/5] fix license handling --- net-tools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-tools.spec b/net-tools.spec index f26f09c..934986b 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.25.%{checkout}%{?dist} +Release: 0.26.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -149,7 +149,8 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %systemd_post arp-ethers.service %files -f %{name}.lang -%doc COPYING +%{!?_licensedir:%global license %%doc} +%license COPYING %{_bindir}/netstat %{_sbindir}/ifconfig %{_sbindir}/route @@ -166,6 +167,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Fri Jul 18 2014 Tom Callaway - 2.0-0.26.20140707git +- fix license handling + * Mon Jul 07 2014 Jiri Popelka - 2.0-0.25.20140707git - latest upstream snapshot From 6b265ea7ce14db897cd3fec546a657e7a6934143 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 11:28:11 +0000 Subject: [PATCH 2/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- net-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-tools.spec b/net-tools.spec index 934986b..436d915 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.26.%{checkout}%{?dist} +Release: 0.27.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -167,6 +167,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 2.0-0.27.20140707git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 18 2014 Tom Callaway - 2.0-0.26.20140707git - fix license handling From 454e15019d3866737b21e4d71b1191117c3a3a9a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Oct 2014 10:50:18 +0200 Subject: [PATCH 3/5] Enable bluetooth --- net-tools-bluetooth.patch | 138 ++++++++++++++++++++++++++++++++++++++ net-tools-config.h | 2 +- net-tools-config.make | 2 +- net-tools.spec | 10 ++- 4 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 net-tools-bluetooth.patch diff --git a/net-tools-bluetooth.patch b/net-tools-bluetooth.patch new file mode 100644 index 0000000..12bc64d --- /dev/null +++ b/net-tools-bluetooth.patch @@ -0,0 +1,138 @@ +From 15dea010bca0d7110843e5b5518dbcc81d847b1d Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Fri, 3 Oct 2014 10:46:18 +0200 +Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs + +Yay for the ABI breakage. +--- + lib/pathnames.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/pathnames.h b/lib/pathnames.h +index 14b051c..045b04a 100644 +--- a/lib/pathnames.h ++++ b/lib/pathnames.h +@@ -53,8 +53,8 @@ + #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25/route" + #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" + #define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" +-#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/class/bluetooth/l2cap" +-#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/class/bluetooth/rfcomm" ++#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/kernel/debug/bluetooth/l2cap" ++#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/kernel/debug/bluetooth/rfcomm" + + /* pathname for the netlink device */ + #define _PATH_DEV_ROUTE "/dev/route" +-- +1.9.3 + +From a6341e8204a6a7b57fd3cb392b185800e5829769 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Fri, 3 Oct 2014 10:46:41 +0200 +Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm + +--- + netstat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netstat.c b/netstat.c +index d0c364f..b9a91f5 100644 +--- a/netstat.c ++++ b/netstat.c +@@ -1909,7 +1909,7 @@ int main + getroute_init(); /* Set up AF routing support */ + + afname[0] = '\0'; +- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) + switch (i) { + case -1: + break; +-- +1.9.3 + +From 854432e7f2468cab9685fce98e95d720c7cae5cc Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Fri, 3 Oct 2014 10:46:56 +0200 +Subject: [PATCH 3/3] man: Document Bluetooth options + +--- + man/en_US/netstat.8 | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8 +index 3157dc4..055ac5e 100644 +--- a/man/en_US/netstat.8 ++++ b/man/en_US/netstat.8 +@@ -23,6 +23,8 @@ netstat \- Print network connections, routing tables, interface statistics, masq + .RB [ \-\-udplite | \-U ] + .RB [ \-\-sctp | \-S ] + .RB [ \-\-raw | \-w ] ++.RB [ \-\-l2cap | \-2 ] ++.RB [ \-\-rfcomm | \-f ] + .RB [ \-\-listening | \-l ] + .RB [ \-\-all | \-a ] + .RB [ \-\-numeric | \-n ] +@@ -85,13 +87,14 @@ netstat \- Print network connections, routing tables, interface statistics, masq + .PP + .RB [ -4 | \-\-inet ] + .RB [ -6 | \-\-inet6 ] +-.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp ", ... } ]" ++.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp , bluetooth ", ... } ]" + .RB [ \-\-unix | \-x ] + .RB [ \-\-inet | \-\-ip | \-\-tcpip ] + .RB [ \-\-ax25 ] + .RB [ \-\-x25 ] + .RB [ \-\-rose ] + .RB [ \-\-ash ] ++.RB [ \-\-bluetooth ] + .RB [ \-\-ipx ] + .RB [ \-\-netrom ] + .RB [ \-\-ddp | \-\-appletalk ] +@@ -163,8 +166,9 @@ is a comma (',') separated list of address family keywords like + .BR ax25 , + .BR netrom , + .BR econet , ++.BR ddp , + and +-.BR ddp . ++.BR bluetooth . + This has the same effect as using the + .BR \-\-inet | -4 , + .BR \-\-inet6 | -6 , +@@ -172,13 +176,18 @@ This has the same effect as using the + .BR \-\-ipx , + .BR \-\-ax25 , + .BR \-\-netrom , ++.B \-\-ddp , + and +-.B \-\-ddp ++.B \-\-bluetooth + options. + .P + The address family + .B inet + (Iv4) includes raw, udp, udplite and tcp protocol sockets. ++.P ++The address family ++.B bluetooth ++(Iv4) includes l2cap and rfcomm protocol sockets. + .SS "\-c, \-\-continuous" + This will cause + .B netstat +@@ -447,6 +456,12 @@ status information via the following files. + .I /proc/net/ip_masquerade + -- masqueraded connections + ++.I /sys/kernel/debug/bluetooth/l2cap ++-- Bluetooth L2CAP information ++ ++.I /sys/kernel/debug/bluetooth/rfcomm ++-- Bluetooth serial connections ++ + .I /proc/net/snmp + -- statistics + .fi +-- +1.9.3 + diff --git a/net-tools-config.h b/net-tools-config.h index 56e5367..024f730 100644 --- a/net-tools-config.h +++ b/net-tools-config.h @@ -38,7 +38,7 @@ #define HAVE_AFECONET 1 #define HAVE_AFDECnet 0 #define HAVE_AFASH 1 -#define HAVE_AFBLUETOOTH 0 +#define HAVE_AFBLUETOOTH 1 /* * diff --git a/net-tools-config.make b/net-tools-config.make index 11a0246..cb4070a 100644 --- a/net-tools-config.make +++ b/net-tools-config.make @@ -11,7 +11,7 @@ HAVE_AFX25=1 HAVE_AFECONET=1 # HAVE_AFDECnet=0 HAVE_AFASH=1 -# HAVE_AFBLUETOOTH=0 +HAVE_AFBLUETOOTH=1 HAVE_HWETHER=1 HAVE_HWARC=1 HAVE_HWSLIP=1 diff --git a/net-tools.spec b/net-tools.spec index 436d915..e562b1b 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.27.%{checkout}%{?dist} +Release: 0.28.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -56,6 +56,10 @@ Patch20: ether-wake-interfaces.patch # make sctp quiet on systems without sctp (#1063906) Patch21: net-tools-sctp-quiet.patch +# Fix bluetooth bitrot. Set to net-tools-devel@ on 2013/10/03 +Patch22: net-tools-bluetooth.patch + +BuildRequires: bluez-libs-devel BuildRequires: gettext, libselinux BuildRequires: libselinux-devel BuildRequires: systemd-units @@ -90,6 +94,7 @@ cp %SOURCE8 ./man/en_US %patch20 -p1 -b .interfaces %patch21 -p1 -b .sctp-quiet +%patch22 -p1 -b .bluetooth touch ./config.h @@ -167,6 +172,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Fri Oct 03 2014 Lubomir Rintel - 2.0-0.28.20140707git +- Enable bluetooth + * Sun Aug 17 2014 Fedora Release Engineering - 2.0-0.27.20140707git - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From dad92625d827fb7cbe82bdc4df8b775233e33b4d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Oct 2014 11:12:17 +0200 Subject: [PATCH 4/5] Fixup the bluetooth patch so that it actually applies --- net-tools-bluetooth.patch | 24 ++++++++++++------------ net-tools.spec | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/net-tools-bluetooth.patch b/net-tools-bluetooth.patch index 12bc64d..5144096 100644 --- a/net-tools-bluetooth.patch +++ b/net-tools-bluetooth.patch @@ -1,4 +1,4 @@ -From 15dea010bca0d7110843e5b5518dbcc81d847b1d Mon Sep 17 00:00:00 2001 +From a80c106764c771a7fa3f135dfb4b3bbd11f2f9fc Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Oct 2014 10:46:18 +0200 Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs @@ -26,7 +26,7 @@ index 14b051c..045b04a 100644 -- 1.9.3 -From a6341e8204a6a7b57fd3cb392b185800e5829769 Mon Sep 17 00:00:00 2001 +From 6cfde210b8d51b209802ec1ff3738eba189a810c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Oct 2014 10:46:41 +0200 Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm @@ -36,22 +36,22 @@ Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netstat.c b/netstat.c -index d0c364f..b9a91f5 100644 +index 4f4ba12..9171401 100644 --- a/netstat.c +++ b/netstat.c -@@ -1909,7 +1909,7 @@ int main +@@ -2157,7 +2157,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) +- while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) switch (i) { case -1: break; -- 1.9.3 -From 854432e7f2468cab9685fce98e95d720c7cae5cc Mon Sep 17 00:00:00 2001 +From 25db8db512f960ce371a5035867ad84d3303b3d4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Oct 2014 10:46:56 +0200 Subject: [PATCH 3/3] man: Document Bluetooth options @@ -61,7 +61,7 @@ Subject: [PATCH 3/3] man: Document Bluetooth options 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8 -index 3157dc4..055ac5e 100644 +index 7fcd41b..2877515 100644 --- a/man/en_US/netstat.8 +++ b/man/en_US/netstat.8 @@ -23,6 +23,8 @@ netstat \- Print network connections, routing tables, interface statistics, masq @@ -73,7 +73,7 @@ index 3157dc4..055ac5e 100644 .RB [ \-\-listening | \-l ] .RB [ \-\-all | \-a ] .RB [ \-\-numeric | \-n ] -@@ -85,13 +87,14 @@ netstat \- Print network connections, routing tables, interface statistics, masq +@@ -91,13 +93,14 @@ netstat \- Print network connections, routing tables, interface statistics, masq .PP .RB [ -4 | \-\-inet ] .RB [ -6 | \-\-inet6 ] @@ -89,7 +89,7 @@ index 3157dc4..055ac5e 100644 .RB [ \-\-ipx ] .RB [ \-\-netrom ] .RB [ \-\-ddp | \-\-appletalk ] -@@ -163,8 +166,9 @@ is a comma (',') separated list of address family keywords like +@@ -169,8 +172,9 @@ is a comma (',') separated list of address family keywords like .BR ax25 , .BR netrom , .BR econet , @@ -100,7 +100,7 @@ index 3157dc4..055ac5e 100644 This has the same effect as using the .BR \-\-inet | -4 , .BR \-\-inet6 | -6 , -@@ -172,13 +176,18 @@ This has the same effect as using the +@@ -178,13 +182,18 @@ This has the same effect as using the .BR \-\-ipx , .BR \-\-ax25 , .BR \-\-netrom , @@ -120,7 +120,7 @@ index 3157dc4..055ac5e 100644 .SS "\-c, \-\-continuous" This will cause .B netstat -@@ -447,6 +456,12 @@ status information via the following files. +@@ -458,6 +467,12 @@ status information via the following files. .I /proc/net/ip_masquerade -- masqueraded connections diff --git a/net-tools.spec b/net-tools.spec index e562b1b..f75da90 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -57,6 +57,7 @@ Patch20: ether-wake-interfaces.patch Patch21: net-tools-sctp-quiet.patch # Fix bluetooth bitrot. Set to net-tools-devel@ on 2013/10/03 +# From: https://github.com/lkundrak/net-tools/commits/lr-bluetooth-fixes Patch22: net-tools-bluetooth.patch BuildRequires: bluez-libs-devel From 7d3b084780c582214e1cfdb4623c3119b25fc01a Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 6 Oct 2014 10:24:02 +0200 Subject: [PATCH 5/5] latest upstream snapshot (#1149405) --- .gitignore | 2 + net-tools-bluetooth.patch | 138 -------------------------------------- net-tools-interface.patch | 30 ++++----- net-tools.spec | 19 +++--- sources | 2 +- 5 files changed, 26 insertions(+), 165 deletions(-) delete mode 100644 net-tools-bluetooth.patch diff --git a/.gitignore b/.gitignore index 3a4c9fa..8c80ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ net-tools-1.60.tar.bz2 /net-tools-2.0.20131004git.tar.xz /net-tools-2.0.20131119git.tar.xz /net-tools-2.0.20140707git.tar.xz +/net-tools-2.0.20141006git.tar.xz +/net-tools-2.0.20141007git.tar.xz diff --git a/net-tools-bluetooth.patch b/net-tools-bluetooth.patch deleted file mode 100644 index 5144096..0000000 --- a/net-tools-bluetooth.patch +++ /dev/null @@ -1,138 +0,0 @@ -From a80c106764c771a7fa3f135dfb4b3bbd11f2f9fc Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Oct 2014 10:46:18 +0200 -Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs - -Yay for the ABI breakage. ---- - lib/pathnames.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/pathnames.h b/lib/pathnames.h -index 14b051c..045b04a 100644 ---- a/lib/pathnames.h -+++ b/lib/pathnames.h -@@ -53,8 +53,8 @@ - #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25/route" - #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" - #define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" --#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/class/bluetooth/l2cap" --#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/class/bluetooth/rfcomm" -+#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/kernel/debug/bluetooth/l2cap" -+#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/kernel/debug/bluetooth/rfcomm" - - /* pathname for the netlink device */ - #define _PATH_DEV_ROUTE "/dev/route" --- -1.9.3 - -From 6cfde210b8d51b209802ec1ff3738eba189a810c Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Oct 2014 10:46:41 +0200 -Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm - ---- - netstat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netstat.c b/netstat.c -index 4f4ba12..9171401 100644 ---- a/netstat.c -+++ b/netstat.c -@@ -2157,7 +2157,7 @@ int main - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; --- -1.9.3 - -From 25db8db512f960ce371a5035867ad84d3303b3d4 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Oct 2014 10:46:56 +0200 -Subject: [PATCH 3/3] man: Document Bluetooth options - ---- - man/en_US/netstat.8 | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8 -index 7fcd41b..2877515 100644 ---- a/man/en_US/netstat.8 -+++ b/man/en_US/netstat.8 -@@ -23,6 +23,8 @@ netstat \- Print network connections, routing tables, interface statistics, masq - .RB [ \-\-udplite | \-U ] - .RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] -+.RB [ \-\-l2cap | \-2 ] -+.RB [ \-\-rfcomm | \-f ] - .RB [ \-\-listening | \-l ] - .RB [ \-\-all | \-a ] - .RB [ \-\-numeric | \-n ] -@@ -91,13 +93,14 @@ netstat \- Print network connections, routing tables, interface statistics, masq - .PP - .RB [ -4 | \-\-inet ] - .RB [ -6 | \-\-inet6 ] --.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp ", ... } ]" -+.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp , bluetooth ", ... } ]" - .RB [ \-\-unix | \-x ] - .RB [ \-\-inet | \-\-ip | \-\-tcpip ] - .RB [ \-\-ax25 ] - .RB [ \-\-x25 ] - .RB [ \-\-rose ] - .RB [ \-\-ash ] -+.RB [ \-\-bluetooth ] - .RB [ \-\-ipx ] - .RB [ \-\-netrom ] - .RB [ \-\-ddp | \-\-appletalk ] -@@ -169,8 +172,9 @@ is a comma (',') separated list of address family keywords like - .BR ax25 , - .BR netrom , - .BR econet , -+.BR ddp , - and --.BR ddp . -+.BR bluetooth . - This has the same effect as using the - .BR \-\-inet | -4 , - .BR \-\-inet6 | -6 , -@@ -178,13 +182,18 @@ This has the same effect as using the - .BR \-\-ipx , - .BR \-\-ax25 , - .BR \-\-netrom , -+.B \-\-ddp , - and --.B \-\-ddp -+.B \-\-bluetooth - options. - .P - The address family - .B inet - (Iv4) includes raw, udp, udplite and tcp protocol sockets. -+.P -+The address family -+.B bluetooth -+(Iv4) includes l2cap and rfcomm protocol sockets. - .SS "\-c, \-\-continuous" - This will cause - .B netstat -@@ -458,6 +467,12 @@ status information via the following files. - .I /proc/net/ip_masquerade - -- masqueraded connections - -+.I /sys/kernel/debug/bluetooth/l2cap -+-- Bluetooth L2CAP information -+ -+.I /sys/kernel/debug/bluetooth/rfcomm -+-- Bluetooth serial connections -+ - .I /proc/net/snmp - -- statistics - .fi --- -1.9.3 - diff --git a/net-tools-interface.patch b/net-tools-interface.patch index ebe85db..04a3ff0 100644 --- a/net-tools-interface.patch +++ b/net-tools-interface.patch @@ -1,7 +1,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.interface net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.interface 2012-10-04 11:31:00.753513633 +0200 -+++ net-tools-2.0/man/en_US/netstat.8 2012-10-04 11:31:00.755513607 +0200 -@@ -46,9 +46,9 @@ netstat \- Print network connections, ro +--- net-tools-2.0/man/en_US/netstat.8.interface 2014-10-07 11:42:22.683785562 +0200 ++++ net-tools-2.0/man/en_US/netstat.8 2014-10-07 11:42:22.686785520 +0200 +@@ -49,9 +49,9 @@ netstat \- Print network connections, ro .RB [delay] .P .B netstat @@ -13,7 +13,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.interface net-tools-2.0/man/en_US/net .RB [ \-\-verbose | \-v ] .RB [ \-\-program | \-p ] .RB [ \-\-numeric | \-n ] -@@ -129,8 +129,8 @@ and +@@ -134,8 +134,8 @@ and produce the same output. .SS "\-\-groups , \-g" Display multicast group membership information for IPv4 and IPv6. @@ -25,9 +25,9 @@ diff -up net-tools-2.0/man/en_US/netstat.8.interface net-tools-2.0/man/en_US/net Display a list of masqueraded connections. .SS "\-\-statistics , \-s" diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.interface 2012-10-04 11:31:00.745513734 +0200 -+++ net-tools-2.0/netstat.c 2012-10-04 11:31:00.756513594 +0200 -@@ -143,6 +143,7 @@ char *Release = RELEASE, *Version = "net +--- net-tools-2.0/netstat.c.interface 2014-10-07 11:42:22.681785591 +0200 ++++ net-tools-2.0/netstat.c 2014-10-07 11:44:07.227294118 +0200 +@@ -144,6 +144,7 @@ static char *Release = RELEASE, *Signatu #define E_IOCTL -3 int flag_int = 0; @@ -35,7 +35,7 @@ diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c int flag_rou = 0; int flag_mas = 0; int flag_sta = 0; -@@ -1786,6 +1787,7 @@ static int rfcomm_info(void) +@@ -1782,6 +1783,7 @@ static int rfcomm_info(void) static int iface_info(void) { static int count=0; @@ -43,7 +43,7 @@ diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c if (skfd < 0) { if ((skfd = sockets_open(0)) < 0) { -@@ -1800,7 +1802,11 @@ static int iface_info(void) +@@ -1796,7 +1798,11 @@ static int iface_info(void) printf(_("Iface MTU 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-2.0/netstat.c.interface net-tools-2.0/netstat.c perror(_("missing interface information")); exit(1); } -@@ -1826,9 +1832,10 @@ static void usage(void) +@@ -1822,9 +1828,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-2.0/netstat.c.interface net-tools-2.0/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")); -@@ -1873,7 +1880,7 @@ int main +@@ -1869,7 +1876,7 @@ int main { AFTRANS_OPTS, {"version", 0, 0, 'V'}, @@ -77,16 +77,16 @@ diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c {"help", 0, 0, 'h'}, {"route", 0, 0, 'r'}, #if HAVE_FW_MASQUERADE -@@ -1917,7 +1924,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?Z", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF) +- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) ++ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) switch (i) { case -1: break; -@@ -1958,6 +1965,13 @@ int main +@@ -1954,6 +1961,13 @@ int main case 'p': flag_prg++; break; diff --git a/net-tools.spec b/net-tools.spec index f75da90..c5e95d7 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%global checkout 20140707git +%global checkout 20141007git Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.28.%{checkout}%{?dist} +Release: 0.29.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -56,10 +56,6 @@ Patch20: ether-wake-interfaces.patch # make sctp quiet on systems without sctp (#1063906) Patch21: net-tools-sctp-quiet.patch -# Fix bluetooth bitrot. Set to net-tools-devel@ on 2013/10/03 -# From: https://github.com/lkundrak/net-tools/commits/lr-bluetooth-fixes -Patch22: net-tools-bluetooth.patch - BuildRequires: bluez-libs-devel BuildRequires: gettext, libselinux BuildRequires: libselinux-devel @@ -95,7 +91,6 @@ cp %SOURCE8 ./man/en_US %patch20 -p1 -b .interfaces %patch21 -p1 -b .sctp-quiet -%patch22 -p1 -b .bluetooth touch ./config.h @@ -125,8 +120,8 @@ make BASEDIR=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} install mv %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir} mv %{buildroot}%{_bindir}/route %{buildroot}%{_sbindir} -install -m 755 ether-wake %{buildroot}%{_sbindir} -install -m 755 mii-diag %{buildroot}%{_sbindir} +install -p -m 755 ether-wake %{buildroot}%{_sbindir} +install -p -m 755 mii-diag %{buildroot}%{_sbindir} rm %{buildroot}%{_sbindir}/rarp rm %{buildroot}%{_mandir}/man8/rarp.8* @@ -146,8 +141,7 @@ rm -rf %{buildroot}%{_mandir}/man1 rm -rf %{buildroot}%{_mandir}/pt/man1 # install systemd unit file -mkdir -p %{buildroot}%{_unitdir} -install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} +install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service %find_lang %{name} --all-name --with-man @@ -173,6 +167,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Tue Oct 07 2014 Jiri Popelka - 2.0-0.29.20141007git +- latest upstream snapshot (#1149405) + * Fri Oct 03 2014 Lubomir Rintel - 2.0-0.28.20140707git - Enable bluetooth diff --git a/sources b/sources index 7d9ace3..a559c50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e63b4ba3b2f79d95819568578475c709 net-tools-2.0.20140707git.tar.xz +a2e985fc934168857a719930d662b119 net-tools-2.0.20141007git.tar.xz