rpms/net-tools
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup the bluetooth patch so that it actually applies

Browse Source
This commit is contained in:
Lubomir Rintel 2014-10-03 11:12:17 +02:00
parent 454e15019d
commit dad92625d8
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net-tools-bluetooth.patch
View File

@ -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 <lkundrak@v3.sk> From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 3 Oct 2014 10:46:18 +0200 Date: Fri, 3 Oct 2014 10:46:18 +0200
Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs
@ -26,7 +26,7 @@ index 14b051c..045b04a 100644
-- --
1.9.3 1.9.3
From a6341e8204a6a7b57fd3cb392b185800e5829769 Mon Sep 17 00:00:00 2001 From 6cfde210b8d51b209802ec1ff3738eba189a810c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk> From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 3 Oct 2014 10:46:41 +0200 Date: Fri, 3 Oct 2014 10:46:41 +0200
Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm 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(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/netstat.c b/netstat.c diff --git a/netstat.c b/netstat.c
index d0c364f..b9a91f5 100644 index 4f4ba12..9171401 100644
--- a/netstat.c --- a/netstat.c
+++ b/netstat.c +++ b/netstat.c
@@ -1909,7 +1909,7 @@ int main @@ -2157,7 +2157,7 @@ int main
getroute_init(); /* Set up AF routing support */ getroute_init(); /* Set up AF routing support */
afname[0] = '\0'; 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) { switch (i) {
case -1: case -1:
break; break;
-- --
1.9.3 1.9.3
From 854432e7f2468cab9685fce98e95d720c7cae5cc Mon Sep 17 00:00:00 2001 From 25db8db512f960ce371a5035867ad84d3303b3d4 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk> From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 3 Oct 2014 10:46:56 +0200 Date: Fri, 3 Oct 2014 10:46:56 +0200
Subject: [PATCH 3/3] man: Document Bluetooth options 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(-) 1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8 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 --- a/man/en_US/netstat.8
+++ b/man/en_US/netstat.8 +++ b/man/en_US/netstat.8
@@ -23,6 +23,8 @@ netstat \- Print network connections, routing tables, interface statistics, masq @@ -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 [ \-\-listening | \-l ]
.RB [ \-\-all | \-a ] .RB [ \-\-all | \-a ]
.RB [ \-\-numeric | \-n ] .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 .PP
.RB [ -4 | \-\-inet ] .RB [ -4 | \-\-inet ]
.RB [ -6 | \-\-inet6 ] .RB [ -6 | \-\-inet6 ]
@ -89,7 +89,7 @@ index 3157dc4..055ac5e 100644
.RB [ \-\-ipx ] .RB [ \-\-ipx ]
.RB [ \-\-netrom ] .RB [ \-\-netrom ]
.RB [ \-\-ddp | \-\-appletalk ] .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 ax25 ,
.BR netrom , .BR netrom ,
.BR econet , .BR econet ,
@ -100,7 +100,7 @@ index 3157dc4..055ac5e 100644
This has the same effect as using the This has the same effect as using the
.BR \-\-inet | -4 , .BR \-\-inet | -4 ,
.BR \-\-inet6 | -6 , .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 \-\-ipx ,
.BR \-\-ax25 , .BR \-\-ax25 ,
.BR \-\-netrom , .BR \-\-netrom ,
@ -120,7 +120,7 @@ index 3157dc4..055ac5e 100644
.SS "\-c, \-\-continuous" .SS "\-c, \-\-continuous"
This will cause This will cause
.B netstat .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 .I /proc/net/ip_masquerade
-- masqueraded connections -- masqueraded connections

1
net-tools.spec
View File

@ -57,6 +57,7 @@ Patch20: ether-wake-interfaces.patch
Patch21: net-tools-sctp-quiet.patch Patch21: net-tools-sctp-quiet.patch
# Fix bluetooth bitrot. Set to net-tools-devel@ on 2013/10/03 # 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 Patch22: net-tools-bluetooth.patch
BuildRequires: bluez-libs-devel BuildRequires: bluez-libs-devel