diff --git a/iputils-20020927-rh.patch b/iputils-20020927-rh.patch deleted file mode 100644 index 32ec1bc..0000000 --- a/iputils-20020927-rh.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fedora-specific makefile patch. - ---- iputils-s20121221-dist/Makefile 2013-01-07 13:37:04.913224305 +0100 -+++ iputils-s20121221-new/Makefile 2013-01-07 13:42:56.542052062 +0100 -@@ -27,7 +27,7 @@ - # sysfs support (with libsysfs - deprecated) [no|yes|static] - USE_SYSFS=no - # IDN support (experimental) [no|yes|static] --USE_IDN=no -+USE_IDN=yes - - # Do not use getifaddrs [no|yes|static] - WITHOUT_IFADDRS=no -@@ -35,7 +35,7 @@ - ARPING_DEFAULT_DEVICE= - - # GNU TLS library for ping6 [yes|no|static] --USE_GNUTLS=yes -+USE_GNUTLS=no - # Crypto library for ping6 [shared|static] - USE_CRYPTO=shared - # Resolv library for ping6 [yes|static] -@@ -49,7 +49,7 @@ - # ------------------------------------- - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - # CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g --CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g -+CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g -Werror - CCOPTOPT=-O3 - GLIBCFIX=-D_GNU_SOURCE - DEFINES= -@@ -110,7 +110,7 @@ - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES) -+CFLAGS+=$(RPM_OPT_FLAGS) $(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES) - LDLIBS=$(LDLIB) $(ADDLIB) - - UNAME_N:=$(shell uname -n) -@@ -187,6 +187,7 @@ - - # ------------------------------------- - # ninfod -+ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS)) - ninfod: - @set -e; \ - if [ ! -f ninfod/Makefile ]; then \ diff --git a/iputils-20121221-eperm-flood.patch b/iputils-20121221-eperm-flood.patch deleted file mode 100644 index 97641c2..0000000 --- a/iputils-20121221-eperm-flood.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- iputils-s20121221/ping_common.c 2014-03-26 10:41:49.905136743 +0100 -+++ iputils-s20121221-new/ping_common.c 2014-03-26 10:57:38.259918104 +0100 -@@ -525,10 +525,11 @@ resend: - if (i > 0) { - /* Apparently, it is some fatal bug. */ - abort(); -- } else if (errno == ENOBUFS || errno == ENOMEM) { -+ } else if (errno == ENOBUFS || errno == ENOMEM || errno == EPERM) { - int nores_interval; - -- /* Device queue overflow or OOM. Packet is not sent. */ -+ /* Device queue overflow, OOM or operation not permitted. -+ * Packet is not sent. */ - tokens = 0; - /* Slowdown. This works only in adaptive mode (option -A) */ - rtt_addend += (rtt < 8*50000 ? rtt/8 : 50000); -@@ -537,7 +538,8 @@ resend: - nores_interval = SCHINT(interval/2); - if (nores_interval > 500) - nores_interval = 500; -- oom_count++; -+ if (errno != EPERM) -+ oom_count++; - if (oom_count*nores_interval < lingertime) - return nores_interval; - i = 0; diff --git a/iputils-20121221-floodlocale.patch b/iputils-20121221-floodlocale.patch deleted file mode 100644 index 832f21b..0000000 --- a/iputils-20121221-floodlocale.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- iputils-s20121221-orig/ping_common.c 2013-02-01 08:28:29.836191171 +0100 -+++ iputils-s20121221-new/ping_common.c 2013-02-01 08:28:11.013152725 +0100 -@@ -269,7 +269,9 @@ void common_options(int ch) - char *ep; - - errno = 0; -+ setlocale(LC_ALL, "C"); - dbl = strtod(optarg, &ep); -+ setlocale(LC_ALL, ""); - - if (errno || *ep != '\0' || - !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) { diff --git a/iputils-20121221-sigalrm-unblock.patch b/iputils-20121221-sigalrm-unblock.patch deleted file mode 100644 index 3633f67..0000000 --- a/iputils-20121221-sigalrm-unblock.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Rui Prior -Resolves: #1085971 - ---- iputils-s20121221-orig/arping.c 2014-04-10 15:41:29.158243387 +0100 -+++ iputils-s20121221-new/arping.c 2014-04-10 16:02:06.000000000 +0100 -@@ -1215,16 +1215,22 @@ main(int argc, char **argv) - socklen_t alen = sizeof(from); - int cc; - -+ sigemptyset(&sset); -+ sigaddset(&sset, SIGALRM); -+ sigaddset(&sset, SIGINT); -+ /* Unblock SIGALRM so that the previously called alarm() -+ * can prevent recvfrom from blocking forever in case the -+ * inherited procmask is blocking SIGALRM and no packet -+ * is received. */ -+ sigprocmask(SIG_UNBLOCK, &sset, &osset); -+ - if ((cc = recvfrom(s, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &alen)) < 0) { - perror("arping: recvfrom"); - continue; - } - -- sigemptyset(&sset); -- sigaddset(&sset, SIGALRM); -- sigaddset(&sset, SIGINT); -- sigprocmask(SIG_BLOCK, &sset, &osset); -+ sigprocmask(SIG_BLOCK, &sset, NULL); - recv_pack(packet, cc, (struct sockaddr_ll *)&from); - sigprocmask(SIG_SETMASK, &osset, NULL); - } diff --git a/iputils-rh.patch b/iputils-rh.patch new file mode 100644 index 0000000..7c0b0d1 --- /dev/null +++ b/iputils-rh.patch @@ -0,0 +1,37 @@ +--- iputils-s20140519-dist/Makefile 2014-05-19 23:35:28.000000000 +0200 ++++ iputils-s20140519-new/Makefile 2014-05-20 10:51:07.388527442 +0200 +@@ -26,7 +26,7 @@ USE_CAP=yes + # sysfs support (with libsysfs - deprecated) [no|yes|static] + USE_SYSFS=no + # IDN support (experimental) [no|yes|static] +-USE_IDN=no ++USE_IDN=yes + + # Do not use getifaddrs [no|yes|static] + WITHOUT_IFADDRS=no +@@ -34,7 +34,7 @@ WITHOUT_IFADDRS=no + ARPING_DEFAULT_DEVICE= + + # GNU TLS library for ping6 [yes|no|static] +-USE_GNUTLS=yes ++USE_GNUTLS=no + # Crypto library for ping6 [shared|static|no] + USE_CRYPTO=shared + # Resolv library for ping6 [yes|static] +@@ -49,7 +49,7 @@ ENABLE_RDISC_SERVER=no + # What a pity, all new gccs are buggy and -Werror does not work. Sigh. + # CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g + CFLAGS?=-O3 -g +-CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall ++CFLAGS+=$(RPM_OPT_FLAGS) -fno-strict-aliasing -Wstrict-prototypes -Wall -Werror + CPPFLAGS+=-D_GNU_SOURCE + LDLIB= + +@@ -188,6 +188,7 @@ tftpd.o tftpsubs.o: tftp.h + + # ------------------------------------- + # ninfod ++ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS)) + ninfod: + @set -e; \ + if [ ! -f ninfod/Makefile ]; then \ diff --git a/iputils-tracepath-doc.patch b/iputils-tracepath-doc.patch new file mode 100644 index 0000000..abfbabd --- /dev/null +++ b/iputils-tracepath-doc.patch @@ -0,0 +1,19 @@ +commit 51aad205e5e8289b52241cd41b15e0f116c4442a +Author: Jan Synacek +Date: Tue May 20 11:17:00 2014 +0200 + + tracepath,doc: fix corrupted tag + +diff --git a/doc/tracepath.sgml b/doc/tracepath.sgml +index 8048c80..756572f 100644 +--- a/doc/tracepath.sgml ++++ b/doc/tracepath.sgml +@@ -69,7 +69,7 @@ Sets the initial packet length to + + +-