rpms/iputils/devel .cvsignore, 1.12, 1.13 iputils-20070202-ia64_align.patch, 1.1, 1.2 iputils-20070202-idn.patch, 1.3, 1.4 iputils-20071127-corr_type.patch, 1.1, 1.2 iputils-20071127-warnings.patch, 1.1, 1.2 iputils-ping_cleanup.patch, 1.2, 1.3 iputils.spec, 1.67, 1.68 sources, 1.18, 1.19 iputils-20070202-open-max.patch, 1.2, NONE iputils-20071127-output.patch, 1.1, NONE iputils-20071127-timeout.patch, 1.1, NONE iputils-20071127-typing_bug.patch, 1.1, NONE
Jiri Skala
jskala at fedoraproject.org
Mon May 17 12:28:06 UTC 2010
Author: jskala
Update of /cvs/extras/rpms/iputils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28683
Modified Files:
.cvsignore iputils-20070202-ia64_align.patch
iputils-20070202-idn.patch iputils-20071127-corr_type.patch
iputils-20071127-warnings.patch iputils-ping_cleanup.patch
iputils.spec sources
Removed Files:
iputils-20070202-open-max.patch iputils-20071127-output.patch
iputils-20071127-timeout.patch
iputils-20071127-typing_bug.patch
Log Message:
* Tue Apr 20 2010 Jiri Skala <jskala at redhat.com> - 20100418-1
- update to latest upstream
- enables flowlabel feature (-F option)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 25 Feb 2008 10:21:33 -0000 1.12
+++ .cvsignore 17 May 2010 12:28:04 -0000 1.13
@@ -1,3 +1,3 @@
-iputils-s20071127.tar.bz2
+iputils-s20100418.tar.bz2
rdisc.initd
ifenslave.tar.gz
iputils-20070202-ia64_align.patch:
arping.c | 2 +-
ping.c | 4 ++--
ping6.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Index: iputils-20070202-ia64_align.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils-20070202-ia64_align.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iputils-20070202-ia64_align.patch 3 Jun 2008 11:04:03 -0000 1.1
+++ iputils-20070202-ia64_align.patch 17 May 2010 12:28:05 -0000 1.2
@@ -32,9 +32,9 @@ diff -up iputils-s20071127/arping.c.ia64
diff -up iputils-s20071127/ping6.c.ia64_align iputils-s20071127/ping6.c
--- iputils-s20071127/ping6.c.ia64_align 2008-06-02 08:56:32.000000000 +0200
+++ iputils-s20071127/ping6.c 2008-06-02 08:56:32.000000000 +0200
-@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
- }
- options |= F_STRICTSOURCE;
+@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
+
+ free(addr);
} else {
- device = optarg;
+ device = strdup(optarg);
iputils-20070202-idn.patch:
Makefile | 9 +++++++--
ping.c | 25 +++++++++++++++++++++++--
ping_common.c | 4 ++++
3 files changed, 34 insertions(+), 4 deletions(-)
Index: iputils-20070202-idn.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils-20070202-idn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- iputils-20070202-idn.patch 3 Jun 2008 11:04:03 -0000 1.3
+++ iputils-20070202-idn.patch 17 May 2010 12:28:05 -0000 1.4
@@ -1,6 +1,26 @@
---- iputils-s20070202/ping.c.idn 2007-08-06 14:45:36.000000000 +0200
-+++ iputils-s20070202/ping.c 2007-08-06 14:45:36.000000000 +0200
-@@ -58,6 +58,9 @@
+diff -up iputils-s20100418/Makefile.idn iputils-s20100418/Makefile
+--- iputils-s20100418/Makefile.idn 2010-04-20 16:07:59.018479157 +0200
++++ iputils-s20100418/Makefile 2010-04-20 16:10:06.389481427 +0200
+@@ -28,8 +28,13 @@ all: $(TARGETS)
+
+ tftpd: tftpd.o tftpsubs.o
+-arping: arping.o -lsysfs
++arping: arping.o
++
+ ping: ping.o ping_common.o
+-ping6: ping6.o ping_common.o -lresolv -lcrypto
++ $(CC) $(CFLAGS) ping.o ping_common.o -lidn -o ping
++
++ping6: ping6.o ping_common.o
++ $(CC) $(CFLAGS) ping6.o ping_common.o -lresolv -lcrypto -o ping6
++
+ ping.o ping6.o ping_common.o: ping_common.h
+ tftpd.o tftpsubs.o: tftp.h
+
+diff -up iputils-s20100418/ping.c.idn iputils-s20100418/ping.c
+--- iputils-s20100418/ping.c.idn 2010-04-20 16:07:59.038484302 +0200
++++ iputils-s20100418/ping.c 2010-04-20 16:07:59.077485007 +0200
+@@ -58,6 +58,9 @@ char copyright[] =
* This program has to run SUID to ROOT to access the ICMP socket.
*/
@@ -10,8 +30,8 @@
#include "ping_common.h"
#include <netinet/ip.h>
-@@ -122,6 +128,10 @@
- char *target, hnamebuf[MAXHOSTNAMELEN];
+@@ -123,6 +126,10 @@ main(int argc, char **argv)
+ char *target, hnamebuf[MAX_HOSTNAMELEN];
char rspace[3 + 4 * NROUTES + 1]; /* record route space */
+ char *idn;
@@ -21,10 +41,11 @@
icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
socket_errno = errno;
-@@ -242,13 +254,27 @@
+@@ -250,13 +257,27 @@ main(int argc, char **argv)
if (argc == 1)
options |= F_NUMERIC;
} else {
+- hp = gethostbyname(target);
+ rc = idna_to_ascii_lz (target, &idn, 0);
+ if (rc == IDNA_SUCCESS)
+ hp = gethostbyname (idn);
@@ -33,12 +54,12 @@
+ exit(2);
+ }
+ free(idn);
-- hp = gethostbyname(target);
if (!hp) {
fprintf(stderr, "ping: unknown host %s\n", target);
exit(2);
}
memcpy(&whereto.sin_addr, hp->h_addr, 4);
+- strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
+ rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
+ if (rc == IDNA_SUCCESS)
+ strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
@@ -47,72 +68,19 @@
+ exit(2);
+ }
+ free(idn);
-- strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
hnamebuf[sizeof(hnamebuf) - 1] = 0;
hostname = hnamebuf;
}
---- iputils-s20070202/Makefile.idn 2007-08-06 14:45:36.000000000 +0200
-+++ iputils-s20070202/Makefile 2007-08-06 14:45:36.000000000 +0200
-@@ -27,8 +27,13 @@
-
-
- tftpd: tftpd.o tftpsubs.o
-+
- ping: ping.o ping_common.o
-+ $(CC) $(CFLAGS) ping.o ping_common.o -lidn -o ping
-+
- ping6: ping6.o ping_common.o
-+ $(CC) $(CFLAGS) ping6.o ping_common.o -o ping6
-+
- ping.o ping6.o ping_common.o: ping_common.h
- tftpd.o tftpsubs.o: tftp.h
-
---- iputils-s20070202/ping6.c.idn 2007-08-06 14:45:36.000000000 +0200
-+++ iputils-s20070202/ping6.c 2007-08-06 14:45:36.000000000 +0200
-@@ -66,6 +66,9 @@
- * More statistics could always be gathered.
- * This program has to run SUID to ROOT to access the ICMP socket.
- */
-+#define _GNU_SOURCE
-+#include <locale.h>
-+
- #include "ping_common.h"
-
- #include <linux/filter.h>
-@@ -210,6 +216,8 @@
- int err, csum_offset, sz_opt;
- static uint32_t scope_id = 0;
-
-+ setlocale(LC_ALL, "");
-+
- icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
- socket_errno = errno;
-
-@@ -296,6 +306,7 @@
-
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_INET6;
-+ hints.ai_flags = AI_IDN;
- gai = getaddrinfo(target, NULL, &hints, &ai);
- if (gai) {
- fprintf(stderr, "unknown host\n");
-@@ -328,6 +341,7 @@
-
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_INET6;
-+ hints.ai_flags = AI_IDN;
- gai = getaddrinfo(target, NULL, &hints, &ai);
- if (gai) {
- fprintf(stderr, "unknown host\n");
---- iputils-s20070202/ping_common.c.idn 2007-08-06 14:45:36.000000000 +0200
-+++ iputils-s20070202/ping_common.c 2007-08-06 14:47:41.000000000 +0200
+diff -up iputils-s20100418/ping_common.c.idn iputils-s20100418/ping_common.c
+--- iputils-s20100418/ping_common.c.idn 2010-04-20 16:07:59.039478452 +0200
++++ iputils-s20100418/ping_common.c 2010-04-20 16:07:59.069478660 +0200
@@ -1,3 +1,5 @@
+#include <locale.h>
+
#include "ping_common.h"
#include <ctype.h>
#include <sched.h>
-@@ -97,6 +102,7 @@
+@@ -98,6 +100,7 @@ static void fill(char *patp)
void common_options(int ch)
{
@@ -120,7 +88,7 @@
switch(ch) {
case 'a':
options |= F_AUDIBLE;
-@@ -222,6 +230,7 @@
+@@ -242,6 +245,7 @@ void common_options(int ch)
default:
abort();
}
iputils-20071127-corr_type.patch:
ping.c | 6 ++++--
ping6.c | 2 +-
rdisc.c | 11 ++++++++---
tracepath.c | 2 +-
tracepath6.c | 2 +-
5 files changed, 15 insertions(+), 8 deletions(-)
Index: iputils-20071127-corr_type.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils-20071127-corr_type.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iputils-20071127-corr_type.patch 25 Feb 2009 21:59:39 -0000 1.1
+++ iputils-20071127-corr_type.patch 17 May 2010 12:28:05 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up iputils-s20071127/ping6.c.corr_type iputils-s20071127/ping6.c
---- iputils-s20071127/ping6.c.corr_type 2009-02-16 14:47:29.000000000 +0100
-+++ iputils-s20071127/ping6.c 2009-02-18 09:12:46.000000000 +0100
-@@ -775,7 +775,7 @@ parse_reply(struct msghdr *msg, int cc,
+diff -up iputils-s20100418/ping6.c.corr_type iputils-s20100418/ping6.c
+--- iputils-s20100418/ping6.c.corr_type 2010-04-20 15:42:39.181245576 +0200
++++ iputils-s20100418/ping6.c 2010-04-20 15:42:39.198230879 +0200
+@@ -1335,7 +1335,7 @@ parse_reply(struct msghdr *msg, int cc,
#endif
if (c->cmsg_len < CMSG_LEN(sizeof(int)))
continue;
@@ -10,10 +10,10 @@ diff -up iputils-s20071127/ping6.c.corr_
}
}
-diff -up iputils-s20071127/ping.c.corr_type iputils-s20071127/ping.c
---- iputils-s20071127/ping.c.corr_type 2009-02-16 13:58:38.000000000 +0100
-+++ iputils-s20071127/ping.c 2009-02-16 14:22:49.000000000 +0100
-@@ -1193,18 +1193,20 @@ pr_addr(__u32 addr)
+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)
struct hostent *hp;
static char buf[4096];
static __u32 addr_cache = 0;
@@ -36,10 +36,10 @@ diff -up iputils-s20071127/ping.c.corr_t
return(buf);
}
-diff -up iputils-s20071127/rdisc.c.corr_type iputils-s20071127/rdisc.c
---- iputils-s20071127/rdisc.c.corr_type 2009-02-18 11:04:14.000000000 +0100
-+++ iputils-s20071127/rdisc.c 2009-02-18 13:32:41.000000000 +0100
-@@ -1476,14 +1476,19 @@ rtioctl(struct in_addr addr, int op)
+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
+@@ -1487,14 +1487,19 @@ rtioctl(struct in_addr addr, int op)
{
int sock;
struct rtentry rt;
@@ -62,22 +62,22 @@ diff -up iputils-s20071127/rdisc.c.corr_
rt.rt_flags = RTF_UP | RTF_GATEWAY;
sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-diff -up iputils-s20071127/tracepath6.c.corr_type iputils-s20071127/tracepath6.c
---- iputils-s20071127/tracepath6.c.corr_type 2009-02-18 13:57:54.000000000 +0100
-+++ iputils-s20071127/tracepath6.c 2009-02-18 13:58:47.000000000 +0100
-@@ -126,7 +126,7 @@ restart:
+diff -up iputils-s20100418/tracepath6.c.corr_type iputils-s20100418/tracepath6.c
+--- iputils-s20100418/tracepath6.c.corr_type 2010-04-18 06:45:45.000000000 +0200
++++ iputils-s20100418/tracepath6.c 2010-04-20 15:44:15.129480911 +0200
+@@ -173,7 +173,7 @@ restart:
#ifdef IPV6_2292HOPLIMIT
case IPV6_2292HOPLIMIT:
#endif
- rethops = *(int*)CMSG_DATA(cmsg);
+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof (int));
break;
- }
- } else if (cmsg->cmsg_level == SOL_IP) {
-diff -up iputils-s20071127/tracepath.c.corr_type iputils-s20071127/tracepath.c
---- iputils-s20071127/tracepath.c.corr_type 2009-02-18 13:53:20.000000000 +0100
-+++ iputils-s20071127/tracepath.c 2009-02-18 13:50:24.000000000 +0100
-@@ -128,7 +128,7 @@ restart:
+ default:
+ printf("cmsg6:%d\n ", cmsg->cmsg_type);
+diff -up iputils-s20100418/tracepath.c.corr_type iputils-s20100418/tracepath.c
+--- iputils-s20100418/tracepath.c.corr_type 2010-04-18 06:45:45.000000000 +0200
++++ iputils-s20100418/tracepath.c 2010-04-20 15:42:39.203240403 +0200
+@@ -145,7 +145,7 @@ restart:
if (cmsg->cmsg_type == IP_RECVERR) {
e = (struct sock_extended_err *) CMSG_DATA(cmsg);
} else if (cmsg->cmsg_type == IP_TTL) {
iputils-20071127-warnings.patch:
clockdiff.c | 2 --
ping.c | 12 ++++++------
ping6.c | 6 +++---
ping_common.c | 8 ++++----
4 files changed, 13 insertions(+), 15 deletions(-)
Index: iputils-20071127-warnings.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils-20071127-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iputils-20071127-warnings.patch 3 Jun 2008 11:04:03 -0000 1.1
+++ iputils-20071127-warnings.patch 17 May 2010 12:28:06 -0000 1.2
@@ -46,7 +46,7 @@ diff -up iputils-s20071127/clockdiff.c.w
diff -up iputils-s20071127/ping6.c.warnings iputils-s20071127/ping6.c
--- iputils-s20071127/ping6.c.warnings 2008-06-02 13:30:06.000000000 +0200
+++ iputils-s20071127/ping6.c 2008-06-02 13:31:14.000000000 +0200
-@@ -667,7 +667,7 @@ int receive_error_msg()
+@@ -1037,7 +1037,7 @@ int receive_error_msg()
if (options & F_QUIET)
goto out;
if (options & F_FLOOD)
@@ -55,16 +55,16 @@ diff -up iputils-s20071127/ping6.c.warni
else if (e->ee_errno != EMSGSIZE)
fprintf(stderr, "ping: local error: %s\n", strerror(e->ee_errno));
else
-@@ -690,7 +690,7 @@ int receive_error_msg()
+@@ -1060,7 +1060,7 @@ int receive_error_msg()
if (options & F_QUIET)
goto out;
if (options & F_FLOOD) {
- write(STDOUT_FILENO, "\bE", 2);
+ printf("\bE");
} else {
+ print_timestamp();
printf("From %s icmp_seq=%u ", pr_addr(&sin6->sin6_addr), ntohs(icmph.icmp6_seq));
- pr_icmph(e->ee_type, e->ee_code, e->ee_info);
-@@ -838,7 +838,7 @@ parse_reply(struct msghdr *msg, int cc,
+@@ -1400,7 +1400,7 @@ parse_reply(struct msghdr *msg, int cc,
return 0;
nerrors++;
if (options & F_FLOOD) {
@@ -72,7 +72,7 @@ diff -up iputils-s20071127/ping6.c.warni
+ printf("\bE");
return 0;
}
- printf("From %s: icmp_seq=%u ", pr_addr(&from->sin6_addr), ntohs(icmph1->icmp6_seq));
+ print_timestamp();
diff -up iputils-s20071127/ping.c.warnings iputils-s20071127/ping.c
--- iputils-s20071127/ping.c.warnings 2008-06-02 13:29:27.000000000 +0200
+++ iputils-s20071127/ping.c 2008-06-02 13:29:27.000000000 +0200
@@ -101,8 +101,8 @@ diff -up iputils-s20071127/ping.c.warnin
- write(STDOUT_FILENO, "\bE", 2);
+ printf("\bE");
} else {
+ print_timestamp();
printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
- pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
@@ -795,7 +795,7 @@ parse_reply(struct msghdr *msg, int cc,
return !error_pkt;
if (options & F_FLOOD) {
@@ -111,7 +111,7 @@ diff -up iputils-s20071127/ping.c.warnin
+ printf("\bE");
return !error_pkt;
}
- printf("From %s: icmp_seq=%u ",
+ print_timestamp();
@@ -812,9 +812,9 @@ parse_reply(struct msghdr *msg, int cc,
}
if ((options & F_FLOOD) && !(options & (F_VERBOSE|F_QUIET))) {
iputils-ping_cleanup.patch:
ping.c | 27 +++++++++++++++++++++++++++
ping_common.c | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
Index: iputils-ping_cleanup.patch
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils-ping_cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- iputils-ping_cleanup.patch 15 Mar 2007 16:43:36 -0000 1.2
+++ iputils-ping_cleanup.patch 17 May 2010 12:28:06 -0000 1.3
@@ -40,11 +40,11 @@
--- iputils/ping_common.c.OLD 2006-02-06 10:34:35.000000000 +0100
+++ iputils/ping_common.c 2006-02-06 10:34:35.000000000 +0100
@@ -819,7 +819,7 @@
- }
- if (pipesize > 1)
- printf(", pipe %d", pipesize);
+ printf("%spipe %d", comma, pipesize);
+ comma = ", ";
+ }
- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
+ if (ntransmitted > 1 && nreceived && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
- printf(", ipg/ewma %d.%03d/%d.%03d ms",
- ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
+ printf("%sipg/ewma %d.%03d/%d.%03d ms",
+ comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- iputils.spec 5 Mar 2010 08:54:47 -0000 1.67
+++ iputils.spec 17 May 2010 12:28:06 -0000 1.68
@@ -1,7 +1,7 @@
Summary: Network monitoring tools including ping
Name: iputils
-Version: 20071127
-Release: 10%{?dist}
+Version: 20100418
+Release: 1%{?dist}
License: BSD
URL: http://www.skbuff.net/iputils
Group: System Environment/Daemons
@@ -16,17 +16,14 @@ Patch2: iputils-20020927-addrcache.patch
Patch3: iputils-20020927-ping-subint.patch
Patch4: iputils-ping_cleanup.patch
Patch5: iputils-ifenslave.patch
-Patch6: iputils-20020927-arping-infiniband.patch
-Patch7: iputils-20070202-idn.patch
-Patch8: iputils-20070202-open-max.patch
-Patch9: iputils-20070202-traffic_class.patch
-Patch10: iputils-20070202-arping_timeout.patch
-Patch11: iputils-20071127-output.patch
-Patch12: iputils-20070202-ia64_align.patch
-Patch13: iputils-20071127-warnings.patch
-Patch14: iputils-20071127-typing_bug.patch
-Patch15: iputils-20071127-corr_type.patch
-Patch16: iputils-20071127-timeout.patch
+Patch6: iputils-20070202-idn.patch
+Patch7: iputils-20070202-traffic_class.patch
+Patch8: iputils-20070202-ia64_align.patch
+Patch9: iputils-20071127-warnings.patch
+Patch10: iputils-20071127-corr_type.patch
+Patch11: iputils-20071127-infiniband.patch
+Patch12: iputils-20100418-convtoint.patch
+Patch13: iputils-20100418-flowlabel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: docbook-utils perl-SGMLSpm
@@ -52,25 +49,22 @@ the target machine is alive and receivin
%patch3 -p1 -b .ping-subint
%patch4 -p1 -b .cleanup
%patch5 -p1 -b .addr
-%patch6 -p1 -b .infiniband
-%patch7 -p1 -b .idn
-%patch8 -p1 -b .open-max
-%patch9 -p1 -b .traffic_class
-%patch10 -p1 -b .arping_timeout
-%patch11 -p1 -b .output
-%patch12 -p1 -b .ia64_align
-%patch13 -p1 -b .warnings
-%patch14 -p1 -b .typing_bug
-%patch15 -p1 -b .corr_type
-%patch16 -p1 -b .timeout
+%patch6 -p1 -b .idn
+%patch7 -p1 -b .traffic_class
+%patch8 -p1 -b .ia64_align
+%patch9 -p1 -b .warnings
+%patch10 -p1 -b .corr_type
+%patch11 -p1 -b .infiniband
+%patch12 -p1 -b .convtoint
+%patch13 -p1 -b .flowlabel
%build
%ifarch s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -fPIE -Werror"
+export CFLAGS="$RPM_OPT_FLAGS -fPIE -Werror -D_GNU_SOURCE -fno-strict-aliasing"
%else
-export CFLAGS="$RPM_OPT_FLAGS -fpie -Werror"
+export CFLAGS="$RPM_OPT_FLAGS -fpie -Werror -D_GNU_SOURCE -fno-strict-aliasing"
%endif
-export LDFLAGS="-pie"
+export LDFLAGS="-pie "
make %{?_smp_mflags} arping clockdiff ping ping6 rdisc tracepath tracepath6
gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave
make -C doc man
@@ -152,6 +146,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rc.d/init.d/rdisc
%changelog
+* Tue Apr 20 2010 Jiri Skala <jskala at redhat.com> - 20100418-1
+- update to latest upstream
+- enables flowlabel feature (-F option)
+
* Fri Mar 05 2010 Jiri Skala <jskala at redhat.com> - 20071127-10
- fixes #557308 - arping ignores the deadline option
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iputils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 3 Jun 2008 11:04:03 -0000 1.18
+++ sources 17 May 2010 12:28:06 -0000 1.19
@@ -1,3 +1,3 @@
-12245e9927d60ff5cf4a99d265bcb7d3 iputils-s20071127.tar.bz2
+df6b0062118cdc5c62e3c810f831e976 iputils-s20100418.tar.bz2
b044213f027e70a2cc1aa882e21fba3b rdisc.initd
844b2f725aecec243c675abff7d1fe1f ifenslave.tar.gz
--- iputils-20070202-open-max.patch DELETED ---
--- iputils-20071127-output.patch DELETED ---
--- iputils-20071127-timeout.patch DELETED ---
--- iputils-20071127-typing_bug.patch DELETED ---
More information about the scm-commits
mailing list