Compare commits

..

No commits in common. 'i8c' and 'c9' have entirely different histories.
i8c ... c9

@ -150,7 +150,7 @@ index e4ed41d..c45b62a 100644
if (ifr.ifr_name[0]) if (ifr.ifr_name[0])
- usage(); - usage();
+ usage(E_OPTERR); + usage(E_OPTERR);
strncpy(ifr.ifr_name, *argv, IFNAMSIZ-1); strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
} else { } else {
if (ifr.ifr_hwaddr.sa_data[0]) if (ifr.ifr_hwaddr.sa_data[0])
- usage(); - usage();

@ -1,92 +0,0 @@
diff --git a/ifconfig.c.old b/ifconfig.c
index 2b8cbbb..6505e07 100644
--- a/ifconfig.c.old
+++ b/ifconfig.c
@@ -967,8 +967,9 @@ int main(int argc, char **argv)
if (ap->herror)
ap->herror(host);
else
- fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
- _("ifconfig: `--help' gives usage information.\n")); exit(1);
+ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name);
+
+ fprintf(stderr,_("ifconfig: `--help' gives usage information.\n")); exit(1);
}
memcpy(&ifr.ifr_addr, sa, sizeof(struct sockaddr));
{
diff --git a/ipmaddr.c.old b/ipmaddr.c
index 2bfaf98..7a313c7 100644
--- a/ipmaddr.c.old
+++ b/ipmaddr.c
@@ -336,7 +336,7 @@ int multiaddr_modify(int cmd, int argc, char **argv)
NEXT_ARG();
if (ifr.ifr_name[0])
usage();
- strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
+ strncpy(ifr.ifr_name, *argv, IFNAMSIZ-1);
} else {
if (ifr.ifr_hwaddr.sa_data[0])
usage();
diff --git a/lib/inet_gr.c.old b/lib/inet_gr.c
index b172d65..75ac240 100644
--- a/lib/inet_gr.c.old
+++ b/lib/inet_gr.c
@@ -292,6 +292,7 @@ int rprint_cache(int ext, int numeric)
printf(_("Source Destination Gateway "
"Flags Metric Ref Use Iface "
"MSS Window irtt TOS HHRef HHUptod SpecDst\n"));
+
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
"Iface", "%15s",
"Destination", "%127s",
diff --git a/lib/ipx_gr.c.old b/lib/ipx_gr.c
index 2fa717c..b98c09c 100644
--- a/lib/ipx_gr.c.old
+++ b/lib/ipx_gr.c
@@ -57,6 +57,7 @@ int IPX_rprint(int options)
if ((ap = get_afntype(AF_IPX)) == NULL) {
EINTERN("lib/ipx_rt.c", "AF_IPX missing");
+ fclose(fp);
return (-1);
}
diff --git a/lib/netrom_gr.c.old b/lib/netrom_gr.c
index ec82fe8..7c3349f 100644
--- a/lib/netrom_gr.c.old
+++ b/lib/netrom_gr.c
@@ -43,8 +43,14 @@ int NETROM_rprint(int options)
if (!f2) perror(_PATH_PROCNET_NR_NEIGH);
if (f1 == NULL || f2 == NULL) {
- printf(_("NET/ROM not configured in this system.\n"));
- return 1;
+ printf(_("NET/ROM not configured in this system.\n"));
+ if(f1 != NULL)
+ fclose(f1);
+
+ if(f2 != NULL)
+ fclose(f2);
+
+ return 1;
}
printf(_("Kernel NET/ROM routing table\n"));
printf(_("Destination Mnemonic Quality Neighbour Iface\n"));
diff --git a/statistics.c.old b/statistics.c
index 02791ed..8c2e18e 100644
--- a/statistics.c.old
+++ b/statistics.c
@@ -568,10 +568,10 @@ int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
f = proc_fopen("/proc/net/sctp/snmp");
if (f) {
process_fd2(f,"/proc/net/sctp/snmp");
- if (ferror(f)) {
+ if (ferror(f))
perror("/proc/net/sctp/snmp");
- fclose(f);
- }
+
+ fclose(f);
}
return(0);
}

@ -1,8 +1,6 @@
diff --git a/lib/inet6_gr.c.old b/lib/inet6_gr.c --- a/lib/inet6_gr.c
index 4e26d30..2ff53a2 100644
--- a/lib/inet6_gr.c.old
+++ b/lib/inet6_gr.c +++ b/lib/inet6_gr.c
@@ -146,7 +146,7 @@ int rprint_fib6(int ext, int numeric) @@ -146,7 +146,7 @@
strcat(flags, "f"); strcat(flags, "f");
/* Print the info. */ /* Print the info. */
@ -10,4 +8,3 @@ index 4e26d30..2ff53a2 100644
+ printf("%-30s %-26s %-4s %-3d %-1d %6d %s\n", + printf("%-30s %-26s %-4s %-3d %-1d %6d %s\n",
addr6, naddr6, flags, metric, refcnt, use, iface); addr6, naddr6, flags, metric, refcnt, use, iface);
} }

@ -3,9 +3,8 @@
Summary: Basic networking tools Summary: Basic networking tools
Name: net-tools Name: net-tools
Version: 2.0 Version: 2.0
Release: 0.52.%{checkout}%{?dist} Release: 0.62.%{checkout}%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/ URL: http://sourceforge.net/projects/net-tools/
# git archive --format=tar --remote=git://git.code.sf.net/p/net-tools/code master | xz > net-tools-%%{version}.%%{checkout}.tar.xz # git archive --format=tar --remote=git://git.code.sf.net/p/net-tools/code master | xz > net-tools-%%{version}.%%{checkout}.tar.xz
@ -36,15 +35,16 @@ Patch20: ether-wake-interfaces.patch
Patch21: net-tools-ifconfig-EiB.patch Patch21: net-tools-ifconfig-EiB.patch
Patch22: net-tools-timer-man.patch Patch22: net-tools-timer-man.patch
Patch23: net-tools-interface-name-len.patch Patch23: net-tools-interface-name-len.patch
Patch24: net-tools-covscan.patch Patch24: net-tools-correct-exit-code.patch
Patch25: net-tools-spelling-error.patch Patch25: net-tools-spelling-error.patch
Patch26: net-tools-correct-exit-code.patch Patch26: net-tools-route-inet6-output.patch
Patch27: net-tools-inet6-output.patch
BuildRequires: make
BuildRequires: bluez-libs-devel BuildRequires: bluez-libs-devel
BuildRequires: gettext, libselinux BuildRequires: gettext, libselinux
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: gcc
%{?systemd_requires} %{?systemd_requires}
%description %description
@ -71,10 +71,9 @@ cp %SOURCE8 ./man/en_US
%patch21 -p1 -b .ifconfig-EiB %patch21 -p1 -b .ifconfig-EiB
%patch22 -p1 -b .timer-man %patch22 -p1 -b .timer-man
%patch23 -p1 -b .interface-name-len %patch23 -p1 -b .interface-name-len
%patch24 -p1 -b .covscan %patch24 -p1 -b .exit-codes
%patch25 -p1 -b .spelling %patch25 -p1 -b .spelling
%patch26 -p1 -b .exit-codes %patch26 -p1 -b .route-inet6
%patch27 -p1 -b .inet6-output
touch ./config.h touch ./config.h
@ -147,16 +146,42 @@ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service
%attr(0644,root,root) %{_unitdir}/arp-ethers.service %attr(0644,root,root) %{_unitdir}/arp-ethers.service
%changelog %changelog
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.0-0.52.20160912git * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0-0.62.20160912git
- Rebuilt for MSVSphere 8.8 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Mar 17 2020 Michal Ruprich <michalruprich@gmail.com> - 2.0-0.52.20160912git * Wed May 19 2021 Michal Ruprich <mruprich@redhat.com> - 2.0-0.61.20160912git
- Resolves: #1711119 - netstat says "packetes" instead of "packets" - Resolves: #1961792 - Missing space in 'route' tool for inet6
- Resolves: #1670355 - Exit code on wrong parameter is zero for many net-tools binaries
- Resolves: #1807989 - The output of `route -A inet6` does not display properly when the 'Use' column output is over 6 digits
* Wed Sep 26 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.51.20160912git * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0-0.60.20160912git
- Resolves: #1607010 - Please review important issues found by covscan - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.59.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Aug 06 2020 Michal Ruprich <mruprich@redhat.com> - 2.0-0.58.20160912git
- Resolves: #1835155 - netstat says "packetes" instead of "packets"
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.57.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.56.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.55.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Mar 06 2019 Michal Ruprich <mruprich@redhat.com> - 2.0-0.54.20160912git
- Resolves: #1670779 - Exit code on wrong parameter is zero for many net-tools binaries
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.53.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.52.20160912git
- Resolves: #1604937 - net-tools: FTBFS in Fedora rawhide
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.51.20160912git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.50.20160912git * Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.50.20160912git
- Resolves: 1557470 - netstat -i cut's interface names - Resolves: 1557470 - netstat -i cut's interface names

Loading…
Cancel
Save