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

Merge branch 'master' into f21

Browse Source
This commit is contained in:
Jiri Popelka 2014-10-07 12:24:39 +02:00
commit 9495cde082
6 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,3 +17,5 @@ net-tools-1.60.tar.bz2
/net-tools-2.0.20131004git.tar.xz /net-tools-2.0.20131004git.tar.xz
/net-tools-2.0.20131119git.tar.xz /net-tools-2.0.20131119git.tar.xz
/net-tools-2.0.20140707git.tar.xz /net-tools-2.0.20140707git.tar.xz
/net-tools-2.0.20141006git.tar.xz
/net-tools-2.0.20141007git.tar.xz

2
net-tools-config.h
View File

@ -38,7 +38,7 @@
#define HAVE_AFECONET 1 #define HAVE_AFECONET 1
#define HAVE_AFDECnet 0 #define HAVE_AFDECnet 0
#define HAVE_AFASH 1 #define HAVE_AFASH 1
#define HAVE_AFBLUETOOTH 0 #define HAVE_AFBLUETOOTH 1
/* /*
* *

2
net-tools-config.make
View File

@ -11,7 +11,7 @@ HAVE_AFX25=1
HAVE_AFECONET=1 HAVE_AFECONET=1
# HAVE_AFDECnet=0 # HAVE_AFDECnet=0
HAVE_AFASH=1 HAVE_AFASH=1
# HAVE_AFBLUETOOTH=0 HAVE_AFBLUETOOTH=1
HAVE_HWETHER=1 HAVE_HWETHER=1
HAVE_HWARC=1 HAVE_HWARC=1
HAVE_HWSLIP=1 HAVE_HWSLIP=1

30
net-tools-interface.patch
View File

@ -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 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.interface 2014-10-07 11:42:22.683785562 +0200
+++ net-tools-2.0/man/en_US/netstat.8 2012-10-04 11:31:00.755513607 +0200 +++ net-tools-2.0/man/en_US/netstat.8 2014-10-07 11:42:22.686785520 +0200
@@ -46,9 +46,9 @@ netstat \- Print network connections, ro @@ -49,9 +49,9 @@ netstat \- Print network connections, ro
.RB [delay] .RB [delay]
.P .P
.B netstat .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 [ \-\-verbose | \-v ]
.RB [ \-\-program | \-p ] .RB [ \-\-program | \-p ]
.RB [ \-\-numeric | \-n ] .RB [ \-\-numeric | \-n ]
@@ -129,8 +129,8 @@ and @@ -134,8 +134,8 @@ and
produce the same output. produce the same output.
.SS "\-\-groups , \-g" .SS "\-\-groups , \-g"
Display multicast group membership information for IPv4 and IPv6. 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. Display a list of masqueraded connections.
.SS "\-\-statistics , \-s" .SS "\-\-statistics , \-s"
diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c 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.interface 2014-10-07 11:42:22.681785591 +0200
+++ net-tools-2.0/netstat.c 2012-10-04 11:31:00.756513594 +0200 +++ net-tools-2.0/netstat.c 2014-10-07 11:44:07.227294118 +0200
@@ -143,6 +143,7 @@ char *Release = RELEASE, *Version = "net @@ -144,6 +144,7 @@ static char *Release = RELEASE, *Signatu
#define E_IOCTL -3 #define E_IOCTL -3
int flag_int = 0; 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_rou = 0;
int flag_mas = 0; int flag_mas = 0;
int flag_sta = 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 iface_info(void)
{ {
static int count=0; 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 < 0) {
if ((skfd = sockets_open(0)) < 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")); 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")); perror(_("missing interface information"));
exit(1); 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, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\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, _(" -i, --interfaces display interface table\n"));
fprintf(stderr, _(" -g, --groups display multicast group memberships\n")); fprintf(stderr, _(" -g, --groups display multicast group memberships\n"));
fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\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, AFTRANS_OPTS,
{"version", 0, 0, 'V'}, {"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'}, {"help", 0, 0, 'h'},
{"route", 0, 0, 'r'}, {"route", 0, 0, 'r'},
#if HAVE_FW_MASQUERADE #if HAVE_FW_MASQUERADE
@@ -1917,7 +1924,7 @@ int main @@ -1913,7 +1920,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: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) { switch (i) {
case -1: case -1:
break; break;
@@ -1958,6 +1965,13 @@ int main @@ -1954,6 +1961,13 @@ int main
case 'p': case 'p':
flag_prg++; flag_prg++;
break; break;

18
net-tools.spec
View File

@ -1,9 +1,9 @@
%global checkout 20140707git %global checkout 20141007git
Summary: Basic networking tools Summary: Basic networking tools
Name: net-tools Name: net-tools
Version: 2.0 Version: 2.0
Release: 0.27.%{checkout}%{?dist} Release: 0.29.%{checkout}%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/ URL: http://sourceforge.net/projects/net-tools/
@ -56,6 +56,7 @@ Patch20: ether-wake-interfaces.patch
# make sctp quiet on systems without sctp (#1063906) # make sctp quiet on systems without sctp (#1063906)
Patch21: net-tools-sctp-quiet.patch Patch21: net-tools-sctp-quiet.patch
BuildRequires: bluez-libs-devel
BuildRequires: gettext, libselinux BuildRequires: gettext, libselinux
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: systemd-units BuildRequires: systemd-units
@ -119,8 +120,8 @@ make BASEDIR=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} install
mv %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir} mv %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir}
mv %{buildroot}%{_bindir}/route %{buildroot}%{_sbindir} mv %{buildroot}%{_bindir}/route %{buildroot}%{_sbindir}
install -m 755 ether-wake %{buildroot}%{_sbindir} install -p -m 755 ether-wake %{buildroot}%{_sbindir}
install -m 755 mii-diag %{buildroot}%{_sbindir} install -p -m 755 mii-diag %{buildroot}%{_sbindir}
rm %{buildroot}%{_sbindir}/rarp rm %{buildroot}%{_sbindir}/rarp
rm %{buildroot}%{_mandir}/man8/rarp.8* rm %{buildroot}%{_mandir}/man8/rarp.8*
@ -140,8 +141,7 @@ rm -rf %{buildroot}%{_mandir}/man1
rm -rf %{buildroot}%{_mandir}/pt/man1 rm -rf %{buildroot}%{_mandir}/pt/man1
# install systemd unit file # install systemd unit file
mkdir -p %{buildroot}%{_unitdir} install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service
install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
%find_lang %{name} --all-name --with-man %find_lang %{name} --all-name --with-man
@ -167,6 +167,12 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
%attr(0644,root,root) %{_unitdir}/arp-ethers.service %attr(0644,root,root) %{_unitdir}/arp-ethers.service
%changelog %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
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-0.27.20140707git * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-0.27.20140707git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
e63b4ba3b2f79d95819568578475c709 net-tools-2.0.20140707git.tar.xz a2e985fc934168857a719930d662b119 net-tools-2.0.20141007git.tar.xz