[iputils] Update to iputils-s20121112 (#875767)
jsynacek
jsynacek at fedoraproject.org
Wed Nov 14 08:37:33 UTC 2012
commit 317683087f6da45bfb30a9601db843bd677ec76b
Author: Jan Synacek <jsynacek at redhat.com>
Date: Tue Nov 13 13:01:31 2012 +0100
Update to iputils-s20121112 (#875767)
+ drop unnecessary patches
+ update patches
.gitignore | 1 +
iputils-20020927-addrcache.patch | 31 ---
iputils-20020927-ping-subint.patch | 2 +-
iputils-20070202-idn.patch | 89 ------
iputils-20070202-traffic_class.patch | 14 -
iputils-20071127-corr_type.patch | 31 ++-
iputils-20071127-infiniband.patch | 280 --------------------
iputils-20100418-flowlabel.patch | 66 -----
iputils-20101006-eth.patch | 35 ++--
iputils-20101006-man.patch | 53 ----
...llback-to-numeric-addresses-while-exiting.patch | 75 ------
iputils-20101006-ping-integer-overflow.patch | 11 -
iputils-20101006-rr.patch | 12 -
iputils-20121112-idn.patch | 11 +
iputils.spec | 30 +--
sources | 2 +-
16 files changed, 58 insertions(+), 685 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b23d0e..a052a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ifenslave.tar.gz
/ifenslave.tar.gz
/iputils-s20121011.tar.bz2
/iputils-s20121106.tar.bz2
+/iputils-s20121112.tar.bz2
diff --git a/iputils-20020927-ping-subint.patch b/iputils-20020927-ping-subint.patch
index e19e724..2a40fbc 100644
--- a/iputils-20020927-ping-subint.patch
+++ b/iputils-20020927-ping-subint.patch
@@ -5,7 +5,7 @@
exit(2);
}
+ } else if (icmp_sock >= 0) {
-+ /* We possible tried to SO_BINDTODEVICE() a subinterface like 'eth0:1' */
++ /* We possibly tried to SO_BINDTODEVICE() a subinterface like 'eth0:1' */
+ perror("Warning: cannot bind to specified iface, falling back");
}
}
diff --git a/iputils-20071127-corr_type.patch b/iputils-20071127-corr_type.patch
index 8246aa6..51906c9 100644
--- a/iputils-20071127-corr_type.patch
+++ b/iputils-20071127-corr_type.patch
@@ -1,29 +1,30 @@
-diff -up iputils-s20100418/ping.c.corr_type iputils-s20100418/ping.c
---- iputils-s20100418/ping.c.corr_type 2010-04-20 15:42:39.193242030 +0200
-+++ iputils-s20100418/ping.c 2010-04-20 15:42:39.199231317 +0200
-@@ -1211,18 +1211,20 @@ pr_addr(__u32 addr)
+--- iputils-s20121112/ping.c.orig 2012-11-13 10:35:16.000000000 +0100
++++ iputils-s20121112/ping.c 2012-11-13 10:40:38.512144804 +0100
+@@ -1226,12 +1226,14 @@ pr_addr(__u32 addr)
+ {
struct hostent *hp;
static char buf[4096];
- static __u32 addr_cache = 0;
+ struct in_addr tmp_addr;
- if ( addr == addr_cache )
- return buf;
-
- addr_cache = addr;
+ in_pr_addr = !setjmp(pr_addr_jmp);
+ tmp_addr.s_addr = addr;
- if ((options & F_NUMERIC) ||
+ if (exiting || (options & F_NUMERIC) ||
!(hp = gethostbyaddr((char *)&addr, 4, AF_INET)))
- sprintf(buf, "%s", inet_ntoa(*(struct in_addr *)&addr));
+ sprintf(buf, "%s", inet_ntoa(tmp_addr));
- else
- snprintf(buf, sizeof(buf), "%s (%s)", hp->h_name,
+ else {
+ char *s;
+ #if USE_IDN
+@@ -1241,7 +1243,7 @@ pr_addr(__u32 addr)
+ s = NULL;
+ #endif
+ snprintf(buf, sizeof(buf), "%s (%s)", s ? s : hp->h_name,
- inet_ntoa(*(struct in_addr *)&addr));
+ inet_ntoa(tmp_addr));
- return(buf);
- }
-
+ #if USE_IDN
+ free(s);
+ #endif
diff -up iputils-s20100418/rdisc.c.corr_type iputils-s20100418/rdisc.c
--- iputils-s20100418/rdisc.c.corr_type 2010-04-18 06:45:45.000000000 +0200
+++ iputils-s20100418/rdisc.c 2010-04-20 15:42:39.201230377 +0200
diff --git a/iputils-20101006-eth.patch b/iputils-20101006-eth.patch
index 475e872..daf15fe 100644
--- a/iputils-20101006-eth.patch
+++ b/iputils-20101006-eth.patch
@@ -1,6 +1,6 @@
---- iputils-s20121011/arping.c.orig 2012-10-16 11:46:12.000000000 +0200
-+++ iputils-s20121011/arping.c 2012-10-16 11:49:09.746673028 +0200
-@@ -40,7 +40,7 @@
+--- iputils-s20121112/arping.c.orig 2012-11-13 12:12:51.000000000 +0100
++++ iputils-s20121112/arping.c 2012-11-13 12:15:11.514261164 +0100
+@@ -50,7 +50,7 @@
static void usage(void) __attribute__((noreturn));
int quit_on_reply=0;
@@ -9,20 +9,19 @@
int ifindex;
char *source;
struct in_addr src, dst;
-@@ -69,6 +69,11 @@ int received, brd_recv, req_recv;
- #define SYSFS_PATH_LEN 256
- #define SOCKADDR_LEN (2 * sizeof(struct sockaddr_ll))
+@@ -71,6 +71,10 @@ struct timeval start, last;
+ int sent, brd_sent;
+ int received, brd_recv, req_recv;
-+#define PREF_ETH "eth"
-+#define PREF_EM "em"
-+
++#define PREF_ETH "eth"
++#define PREF_EM "em"
+static char *dev_file = "/proc/self/net/dev";
+
- #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
- ((tv1).tv_usec-(tv2).tv_usec)/1000 )
-
-@@ -380,6 +385,46 @@ char * read_sysfs_broadcast(char *brdcas
- return brdcast;
+ #ifndef CAPABILITIES
+ static uid_t euid;
+ #endif
+@@ -524,6 +528,46 @@ static void set_device_broadcast(char *d
+ return;
}
+/*
@@ -68,16 +67,16 @@
int
main(int argc, char **argv)
{
-@@ -417,6 +462,8 @@ main(int argc, char **argv)
- exit(1);
- }
+@@ -543,6 +587,8 @@ main(int argc, char **argv)
+
+ disable_capability_raw();
+ device = get_first_ethernet();
+
while ((ch = getopt(argc, argv, "h?bfDUAqc:w:s:I:V")) != EOF) {
switch(ch) {
case 'b':
-@@ -443,6 +490,10 @@ main(int argc, char **argv)
+@@ -569,6 +615,10 @@ main(int argc, char **argv)
timeout = atoi(optarg);
break;
case 'I':
diff --git a/iputils-20121112-idn.patch b/iputils-20121112-idn.patch
new file mode 100644
index 0000000..e9edfa4
--- /dev/null
+++ b/iputils-20121112-idn.patch
@@ -0,0 +1,11 @@
+--- iputils-s20121112/Makefile.orig 2012-11-13 12:35:00.000000000 +0100
++++ iputils-s20121112/Makefile 2012-11-13 12:35:40.515729240 +0100
+@@ -18,7 +18,7 @@ USE_CAP=yes
+ # sysfs support (with libsysfs - deprecated)
+ USE_SYSFS=no
+ # IDN support (experimental
+-USE_IDN=no
++USE_IDN=yes
+
+ # -------------------------------------
+ # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
diff --git a/iputils.spec b/iputils.spec
index cbe7bf9..d0fa1dd 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
Summary: Network monitoring tools including ping
Name: iputils
-Version: 20121106
-Release: 2%{?dist}
+Version: 20121112
+Release: 1%{?dist}
License: BSD
URL: http://www.skbuff.net/iputils
Group: System Environment/Daemons
@@ -14,22 +14,17 @@ Source5: rdisc.sysconfig
Patch0: iputils-20020927-rh.patch
Patch1: iputils-20020124-countermeasures.patch
-Patch2: iputils-20020927-addrcache.patch
Patch3: iputils-20020927-ping-subint.patch
Patch5: iputils-ifenslave.patch
-Patch6: iputils-20070202-idn.patch
-Patch7: iputils-20070202-traffic_class.patch
+Patch6: iputils-20121112-idn.patch
+# Purpose of this patch?
Patch8: iputils-20070202-ia64_align.patch
Patch10: iputils-20071127-corr_type.patch
-Patch11: iputils-20071127-infiniband.patch
Patch12: iputils-20100418-convtoint.patch
-Patch13: iputils-20100418-flowlabel.patch
+# Accepted upstream, will be in the next release
Patch15: iputils-20101006-unused.patch
-Patch16: iputils-20101006-man.patch
+# Use getifaddrs() instead of this?
Patch17: iputils-20101006-eth.patch
-Patch18: iputils-20101006-rr.patch
-Patch21: iputils-20101006-ping-integer-overflow.patch
-Patch22: iputils-20101006-ping-fallback-to-numeric-addresses-while-exiting.patch
BuildRequires: docbook-utils perl-SGMLSpm
BuildRequires: glibc-kernheaders >= 2.4-8.19
@@ -69,22 +64,14 @@ The iputils-sysvinit contains SysV initscritps support.
%patch0 -p1 -b .rh
%patch1 -p1 -b .countermeasures
-%patch2 -p1 -b .addrcache
%patch3 -p1 -b .ping-subint
%patch5 -p1 -b .addr
%patch6 -p1 -b .idn
-%patch7 -p1 -b .traffic_class
%patch8 -p1 -b .ia64_align
%patch10 -p1 -b .corr_type
-%patch11 -p1 -b .infiniband
%patch12 -p1 -b .convtoint
-%patch13 -p1 -b .flowlabel
%patch15 -p1 -b .unused
-%patch16 -p1 -b .man
%patch17 -p1 -b .eth
-%patch18 -p1 -b .rr
-%patch21 -p1 -b .intoverflow
-%patch22 -p1 -b .fallback
%build
%ifarch s390 s390x
@@ -167,6 +154,11 @@ mv -f RELNOTES.tmp RELNOTES
%{_sysconfdir}/rc.d/init.d/rdisc
%changelog
+* Tue Nov 13 2012 Jan Synáček <jsynacek at redhat.com> - 20121112-1
+- Update to iputils-s20121112 (#875767)
+ + drop unnecessary patches
+ + update patches
+
* Thu Nov 08 2012 Jan Synáček <jsynacek at redhat.com> - 20121106-2
- Update ifenslave tarball (#859182)
diff --git a/sources b/sources
index ce00193..7154a3e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-85b0f57f2ceb937aacd1c0cdb58de016 iputils-s20121106.tar.bz2
+fe18b8f0ccd4d38c3fa44a18e975a1a5 iputils-s20121112.tar.bz2
6702c58e970e6a73fc8d9b7c9b63af35 ifenslave.tar.gz
More information about the scm-commits
mailing list