latest upstream snapshot (#1149405)
This commit is contained in:
Jiri Popelka
parent
dad92625d8
commit
7d3b084780
2
.gitignore
vendored
2
.gitignore
vendored
@ -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
|
||||
|
||||
@ -1,138 +0,0 @@
|
||||
From a80c106764c771a7fa3f135dfb4b3bbd11f2f9fc Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
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 <lkundrak@v3.sk>
|
||||
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 <lkundrak@v3.sk>
|
||||
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
|
||||
|
||||
@ -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] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
|
||||
fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\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;
|
||||
|
||||
@ -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 <jpopelka@redhat.com> - 2.0-0.29.20141007git
|
||||
- latest upstream snapshot (#1149405)
|
||||
|
||||
* Fri Oct 03 2014 Lubomir Rintel <lkundrak@v3.sk> - 2.0-0.28.20140707git
|
||||
- Enable bluetooth
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user