Browse Source

net-tools package update

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
master
basebuilder_pel7ppc64bebuilder0 4 years ago
parent
commit
45057c6f79
  1. 10
      SOURCES/net-tools-route-inet6-output.patch
  2. 23
      SPECS/net-tools.spec

10
SOURCES/net-tools-route-inet6-output.patch

@ -0,0 +1,10 @@
--- a/lib/inet6_gr.c
+++ b/lib/inet6_gr.c
@@ -146,7 +146,7 @@
strcat(flags, "f");
/* Print the info. */
- 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);
}

23
SPECS/net-tools.spec

@ -3,7 +3,7 @@
Summary: Basic networking tools Summary: Basic networking tools
Name: net-tools Name: net-tools
Version: 2.0 Version: 2.0
Release: 0.24.%{checkout}%{?dist} Release: 0.25.%{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/
@ -68,8 +68,8 @@ Patch24: net-tools-netstat-sctp-man.patch
# output of interface names was restricted to 8-10 characters max # output of interface names was restricted to 8-10 characters max
Patch25: net-tools-interface-name-len.patch Patch25: net-tools-interface-name-len.patch


# avoid redefinition tunnel struct # output of route -A inet6 is missing a space
Patch100: net-tools-if-tunnel-struct.patch Patch26: net-tools-route-inet6-output.patch


BuildRequires: gettext, libselinux BuildRequires: gettext, libselinux
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
@ -109,19 +109,17 @@ cp %SOURCE8 ./man/en_US
%patch23 -p1 -b .round-EiB %patch23 -p1 -b .round-EiB
%patch24 -p1 -b .sctp-man %patch24 -p1 -b .sctp-man
%patch25 -p1 -b .interface-name-len %patch25 -p1 -b .interface-name-len

%patch26 -p1 -b .route-inet6-output
%patch100 -p1


touch ./config.h touch ./config.h


%build %build
# Sparc and s390 arches need to use -fPIE # Sparc and s390 arches need to use -fPIE
#%ifarch sparcv9 sparc64 s390 s390x %ifarch sparcv9 sparc64 s390 s390x
#export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fPIE" export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fPIE"
#%else %else
#export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fpie" export CFLAGS="$RPM_OPT_FLAGS $CFLAGS -fpie"
#%endif %endif
export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
# RHBZ #853193 # RHBZ #853193
export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now" export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now"


@ -188,6 +186,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
%attr(0644,root,root) %{_unitdir}/arp-ethers.service %attr(0644,root,root) %{_unitdir}/arp-ethers.service


%changelog %changelog
* Mon Jan 07 2019 Michal Ruprich <mruprich@redhat.com> - 2.0-0.25.20131004git
- Resolves: #1632905 - The output of `route -A inet6` does not display properly when the 'Use' column output is over 6 digits

* Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.24.20131004git * Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.24.20131004git
- Resolves: #1568306 - netstat -i only shows 8 characters of Iface name - Resolves: #1568306 - netstat -i only shows 8 characters of Iface name



Loading…
Cancel
Save