Accepting request 522166 from home:pevik:branches:network:utilities
- Update to version s20161105 (Changes taken from the RELNOTES file) * ping: eliminate deadcode & simplify * ping: do not allow oversized packets to root * correctly initialize first hop * ping: fix ping -6 -I * arping,doc: fix documentation of -I * ping: fix error message when getting EACCES from connect() * renamed INSTALL to INSTALL.md * (re)structured INSTALL.md and transformed into markdown; added hint that installation into prefix has to be done with DESTDIR make variable and that there's no prefix support in configure, close #21 * ping: Silence GCC warnings when building with -fstrict-aliasing * tftpd: Drop supplementary groups for root * libgcrypt: fix static linking * doc: Inserted a missing word * tracepath6: avoid redundant family variable * tracepath: borrow everything good from tracepath6 * tracepath: switch to dual-stack operation * tracepath: remove now redundant tracepath6 * docs: fix parallel build of manpages * ping: remove assignments of values that are never read * docs: remove references to ping6 and traceroute6 * ping: work with older kernels that don't support ping sockets * Revert "ping_common.c: fix message flood when EPERM is encountered in ping" * reorder -I option parsing (boo#1057664) * ping: also bind the ICMP socket to the specific device - tracepath6 is now symlink to tracepath. OBS-URL: https://build.opensuse.org/request/show/522166 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=48
This commit is contained in:
committed by
Git OBS Bridge
parent
99b644e08c
commit
2671b3941c
@@ -12,7 +12,7 @@ Index: iputils/ping.c
|
||||
===================================================================
|
||||
--- iputils.orig/ping.c
|
||||
+++ iputils/ping.c
|
||||
@@ -96,6 +96,7 @@ static void usage(void) __attribute__((n
|
||||
@@ -97,6 +97,7 @@ static void usage(void) __attribute__((noreturn));
|
||||
static unsigned short in_cksum(const unsigned short *addr, int len, unsigned short salt);
|
||||
static void pr_icmph(__u8 type, __u8 code, __u32 info, struct icmphdr *icp);
|
||||
static int parsetos(char *str);
|
||||
@@ -20,7 +20,7 @@ Index: iputils/ping.c
|
||||
|
||||
static struct {
|
||||
struct cmsghdr cm;
|
||||
@@ -514,6 +515,8 @@ int ping4_run(int argc, char **argv, str
|
||||
@@ -579,6 +580,8 @@ int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock)
|
||||
options |= F_SOURCEROUTE;
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ Index: iputils/ping.c
|
||||
while (argc > 0) {
|
||||
target = *argv;
|
||||
|
||||
@@ -1627,3 +1630,9 @@ void usage(void)
|
||||
@@ -1699,3 +1702,9 @@ void usage(void)
|
||||
ping6_usage(1);
|
||||
exit(2);
|
||||
}
|
||||
|
@@ -5,14 +5,14 @@ Subject: [PATCH] remove bogus check required for < 2.4.9 kernels
|
||||
|
||||
Debian bug: #709052
|
||||
---
|
||||
ping.c | 25 +------------------------
|
||||
1 file changed, 1 insertion(+), 24 deletions(-)
|
||||
ping.c | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/ping.c b/ping.c
|
||||
index b9d649531621..f9f4a28f5dc1 100644
|
||||
index 75420b8..0668a18 100644
|
||||
--- a/ping.c
|
||||
+++ b/ping.c
|
||||
@ -898,17 +898,6 @@
|
||||
@@ -968,17 +968,6 @@ int ping4_receive_error_msg(socket_st *sock)
|
||||
|
||||
acknowledge(ntohs(icmph.un.echo.sequence));
|
||||
|
||||
@@ -31,5 +31,5 @@ index b9d649531621..f9f4a28f5dc1 100644
|
||||
nerrors++;
|
||||
if (options & F_QUIET)
|
||||
--
|
||||
2.3.5
|
||||
2.14.1
|
||||
|
||||
|
@@ -12,14 +12,11 @@ it with UNBLOCK.
|
||||
Signed-off-by: Marcus Schäfer <ms@suse.de>
|
||||
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
||||
---
|
||||
ping.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
Index: iputils/ping.c
|
||||
===================================================================
|
||||
--- iputils.orig/ping.c
|
||||
+++ iputils/ping.c
|
||||
@@ -443,6 +443,17 @@ main(int argc, char **argv)
|
||||
diff --git a/ping.c b/ping.c
|
||||
index cfae0a5..4def349 100644
|
||||
--- a/ping.c
|
||||
+++ b/ping.c
|
||||
@@ -496,6 +496,17 @@ main(int argc, char **argv)
|
||||
|
||||
/* Create sockets */
|
||||
enable_capability_raw();
|
||||
|
@@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 7 19:27:48 UTC 2017 - pvorel@suse.cz
|
||||
|
||||
- Update to version s20161105 (Changes taken from the RELNOTES file)
|
||||
* ping: eliminate deadcode & simplify
|
||||
* ping: do not allow oversized packets to root
|
||||
* correctly initialize first hop
|
||||
* ping: fix ping -6 -I
|
||||
* arping,doc: fix documentation of -I
|
||||
* ping: fix error message when getting EACCES from connect()
|
||||
* renamed INSTALL to INSTALL.md
|
||||
* (re)structured INSTALL.md and transformed into markdown; added hint that installation into prefix has to be done with DESTDIR make variable and that there's no prefix support in configure, close #21
|
||||
* ping: Silence GCC warnings when building with -fstrict-aliasing
|
||||
* tftpd: Drop supplementary groups for root
|
||||
* libgcrypt: fix static linking
|
||||
* doc: Inserted a missing word
|
||||
* tracepath6: avoid redundant family variable
|
||||
* tracepath: borrow everything good from tracepath6
|
||||
* tracepath: switch to dual-stack operation
|
||||
* tracepath: remove now redundant tracepath6
|
||||
* docs: fix parallel build of manpages
|
||||
* ping: remove assignments of values that are never read
|
||||
* docs: remove references to ping6 and traceroute6
|
||||
* ping: work with older kernels that don't support ping sockets
|
||||
* Revert "ping_common.c: fix message flood when EPERM is encountered in ping"
|
||||
* reorder -I option parsing (boo#1057664)
|
||||
* ping: also bind the ICMP socket to the specific device
|
||||
- tracepath6 is now symlink to tracepath.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 3 10:21:00 UTC 2017 - mchandras@suse.de
|
||||
|
||||
|
10
iputils.spec
10
iputils.spec
@@ -29,7 +29,7 @@ BuildRequires: sed
|
||||
Summary: IPv4 and IPv6 Networking Utilities
|
||||
License: BSD-3-Clause and GPL-2.0+
|
||||
Group: Productivity/Networking/Other
|
||||
Version: s20160308
|
||||
Version: s20161105
|
||||
Release: 0
|
||||
Url: https://github.com/iputils/iputils
|
||||
Source: https://github.com/iputils/iputils/archive/%{version}.tar.gz
|
||||
@@ -47,7 +47,7 @@ Provides: /sbin/arping
|
||||
|
||||
%description
|
||||
This package contains some small network tools for IPv4 and IPv6 like
|
||||
rdisc, ping, arping, tracepath and tracepath6.
|
||||
rdisc, ping, arping and tracepath.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
@@ -71,7 +71,7 @@ export LDFLAGS='-pie -Wl,-z,relro,-z,now'
|
||||
|
||||
# Build only selected apps
|
||||
make %{?_smp_mflags} arping clockdiff ping rdisc tracepath \
|
||||
tracepath6 rarpd
|
||||
rarpd
|
||||
make man
|
||||
|
||||
%install
|
||||
@@ -82,10 +82,10 @@ install clockdiff $RPM_BUILD_ROOT/%{_sbindir}
|
||||
install rdisc $RPM_BUILD_ROOT/%{_sbindir}/in.rdisc
|
||||
# boo#795788
|
||||
install tracepath $RPM_BUILD_ROOT/%{_bindir}
|
||||
install tracepath6 $RPM_BUILD_ROOT/%{_bindir}
|
||||
install ping $RPM_BUILD_ROOT/%{_bindir}
|
||||
# boo#1017616
|
||||
ln -sf %{_bindir}/ping $RPM_BUILD_ROOT/%{_bindir}/ping6
|
||||
ln -sf %{_bindir}/tracepath $RPM_BUILD_ROOT/%{_bindir}/tracepath6
|
||||
|
||||
#install rarpd $RPM_BUILD_ROOT/%{_bindir}
|
||||
#UsrMerge
|
||||
@@ -97,9 +97,9 @@ ln -sf %{_sbindir}/arping $RPM_BUILD_ROOT/sbin
|
||||
ln -sf %{_sbindir}/clockdiff $RPM_BUILD_ROOT/sbin
|
||||
ln -sf %{_sbindir}/in.rdisc $RPM_BUILD_ROOT/sbin
|
||||
ln -sf %{_bindir}/tracepath $RPM_BUILD_ROOT/bin
|
||||
ln -sf %{_bindir}/tracepath6 $RPM_BUILD_ROOT/bin
|
||||
ln -sf %{_bindir}/ping $RPM_BUILD_ROOT/bin
|
||||
ln -sf %{_bindir}/ping6 $RPM_BUILD_ROOT/bin
|
||||
ln -sf %{_bindir}/tracepath6 $RPM_BUILD_ROOT/bin
|
||||
#EndUsrMerge
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
|
||||
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b
|
||||
size 195348
|
3
s20161105.tar.gz
Normal file
3
s20161105.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a
|
||||
size 195879
|
Reference in New Issue
Block a user