Update to s20161105 (#1392759)
This commit is contained in:
Jan Synacek
parent
59fb329e13
commit
2e58202bf3
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@ ifenslave.tar.gz
|
||||
/iputils-s20140519.tar.gz
|
||||
/iputils-s20150815.tar.gz
|
||||
/iputils-s20160308.tar.gz
|
||||
/iputils-s20161105.tar.gz
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
commit 1f6f39b84f81cfa6bc243557a68eebeeac7e8ea3
|
||||
Author: Robert Schiele <rschiele@gmail.com>
|
||||
Date: Mon Mar 14 09:18:08 2016 +0100
|
||||
|
||||
reorder -I option parsing
|
||||
|
||||
This changes -I option parsing in a way that device is only assigned
|
||||
if neither an IPv4 nor an IPv6 address is detected. Otherwise those
|
||||
addresses are misinterpreted as device names and as such will cause
|
||||
error messages later in the code.
|
||||
|
||||
Signed-off-by: Robert Schiele <rschiele@gmail.com>
|
||||
|
||||
diff --git a/ping.c b/ping.c
|
||||
index c42d6eb..498c0e8 100644
|
||||
--- a/ping.c
|
||||
+++ b/ping.c
|
||||
@@ -279,10 +279,6 @@ main(int argc, char **argv)
|
||||
break;
|
||||
}
|
||||
case 'I':
|
||||
- if (inet_pton(AF_INET, optarg, &source.sin_addr) > 0)
|
||||
- options |= F_STRICTSOURCE;
|
||||
- else
|
||||
- device = optarg;
|
||||
/* IPv6 */
|
||||
if (strchr(optarg, ':')) {
|
||||
char *p, *addr = strdup(optarg);
|
||||
@@ -306,6 +302,8 @@ main(int argc, char **argv)
|
||||
options |= F_STRICTSOURCE;
|
||||
|
||||
free(addr);
|
||||
+ } else if (inet_pton(AF_INET, optarg, &source.sin_addr) > 0) {
|
||||
+ options |= F_STRICTSOURCE;
|
||||
} else {
|
||||
device = optarg;
|
||||
}
|
||||
25
iputils.spec
25
iputils.spec
@ -2,8 +2,8 @@
|
||||
|
||||
Summary: Network monitoring tools including ping
|
||||
Name: iputils
|
||||
Version: 20160308
|
||||
Release: 4%{?dist}
|
||||
Version: 20161105
|
||||
Release: 1%{?dist}
|
||||
# some parts are under the original BSD (ping.c)
|
||||
# some are under GPLv2+ (tracepath.c)
|
||||
License: BSD and GPLv2+
|
||||
@ -20,7 +20,6 @@ Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
||||
|
||||
Patch0: iputils-rh.patch
|
||||
Patch1: iputils-ifenslave.patch
|
||||
Patch2: iputils-reorder-I-parsing.patch
|
||||
|
||||
BuildRequires: docbook-utils perl-SGMLSpm
|
||||
BuildRequires: glibc-kernheaders >= 2.4-8.19
|
||||
@ -58,7 +57,6 @@ cp %{SOURCE4} %{SOURCE5} .
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x
|
||||
@ -68,8 +66,7 @@ cp %{SOURCE4} %{SOURCE5} .
|
||||
%endif
|
||||
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
||||
|
||||
make %{?_smp_mflags} arping clockdiff ping rdisc tracepath tracepath6 \
|
||||
ninfod
|
||||
make %{?_smp_mflags} arping clockdiff ping rdisc tracepath ninfod
|
||||
gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
|
||||
make -C doc man
|
||||
|
||||
@ -84,14 +81,13 @@ install -cp ping ${RPM_BUILD_ROOT}%{_bindir}/
|
||||
install -cp ifenslave ${RPM_BUILD_ROOT}%{_sbindir}/
|
||||
install -cp rdisc ${RPM_BUILD_ROOT}%{_sbindir}/
|
||||
install -cp tracepath ${RPM_BUILD_ROOT}%{_bindir}/
|
||||
install -cp tracepath6 ${RPM_BUILD_ROOT}%{_bindir}/
|
||||
install -cp ninfod/ninfod ${RPM_BUILD_ROOT}%{_sbindir}/
|
||||
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
|
||||
ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping
|
||||
ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6
|
||||
ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6
|
||||
ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}
|
||||
ln -sf ../bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir}
|
||||
ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath
|
||||
ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath6
|
||||
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
|
||||
install -cp doc/clockdiff.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
||||
@ -141,17 +137,17 @@ mv -f RELNOTES.tmp RELNOTES
|
||||
%{_sbindir}/ifenslave
|
||||
%{_sbindir}/rdisc
|
||||
%{_bindir}/tracepath
|
||||
%{_bindir}/tracepath6
|
||||
%{_sbindir}/ping
|
||||
%{_sbindir}/ping6
|
||||
%{_sbindir}/tracepath
|
||||
%{_sbindir}/tracepath6
|
||||
%attr(644,root,root) %{_mandir}/man8/clockdiff.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/arping.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/ping.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/ping6.8.gz
|
||||
%{_mandir}/man8/ping6.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/rdisc.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/tracepath.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/tracepath6.8.gz
|
||||
%{_mandir}/man8/tracepath6.8.gz
|
||||
%attr(644,root,root) %{_mandir}/man8/ifenslave.8.gz
|
||||
|
||||
%files ninfod
|
||||
@ -160,6 +156,9 @@ mv -f RELNOTES.tmp RELNOTES
|
||||
%attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Nov 8 2016 Jan Synáček <jsynacek@redhat.com> - 20161105-1
|
||||
- Update to s20161105 (#1392759)
|
||||
|
||||
* Thu Oct 13 2016 Tomáš Mráz <tmraz@redhat.com> - 20160308-4
|
||||
- rebuild with OpenSSL 1.1.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user