Tue Apr 3 17:06:23 UTC 2007

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28189

Modified Files:
	.cvsignore iputils-20020927-rh.patch 
	iputils-ping_cleanup.patch iputils.spec sources 
Added Files:
	iputils-20020927-arping-infiniband.patch 
	iputils-20070202-idn.patch 
Removed Files:
	iputils-20020124-ping_sparcfix.patch 
	iputils-20020124-rdisc-server.patch 
	iputils-20020927-headers.patch iputils-20020927-icmp_seq.patch 
	iputils-20020927-inet_pton.patch 
	iputils-20020927-trace_stop.patch iputils-arping.patch 
	iputils-arping_buf_overflow.patch iputils-flood.patch 
	iputils-gcc41.patch iputils-getaddrinfo.patch 
	iputils-glibckernheaders.patch iputils-ipv6-hoplimit.patch 
	iputils-ping-168166.patch iputils-retvals.patch 
Log Message:
* Tue Apr  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-1
- upgrade to new upstream 20070202
- old and unused patches removed
- resolves: #213897: ifenslave man page from iputils-20020927-41.fc6 is not a man page
- resolves: #213717: arping doesn't work on InfiniBand ipoib interfaces
- resolves: #220302: LTC29372-ping6 doesn't define the destination address along RFC3484


iputils-20020927-arping-infiniband.patch:
 Makefile |    2 +
 arping.c |   66 +++++++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 50 insertions(+), 18 deletions(-)

--- NEW FILE iputils-20020927-arping-infiniband.patch ---
--- iputils/Makefile.infiniband	2007-02-22 15:53:04.000000000 +0100
+++ iputils/Makefile	2007-02-22 15:55:05.000000000 +0100
@@ -45,6 +45,8 @@
 rdisc_srv.o: rdisc.c
 	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
 
+arping: arping.o
+	$(CC) $(LDFLAGS) arping.o $(LOADLIBES) $(LDLIBS) -lsysfs -o arping
 
 check-kernel:
 ifeq ($(KERNEL_INCLUDE),)
--- iputils/arping.c.infiniband	2007-02-22 15:53:04.000000000 +0100
+++ iputils/arping.c	2007-02-22 15:53:05.000000000 +0100
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sysfs/libsysfs.h>
 
 #include "SNAPSHOT.h"
 
@@ -48,8 +49,13 @@
 int s;
 int broadcast_only;
 
-struct sockaddr_ll me;
-struct sockaddr_ll he;
+/*
+ * Make these two structs have padding at the end so the overly long Infiniband
+ * hardware addresses can have the remainder of their address tacked onto
+ * the end of the struct without overlapping anything.
+ */
+struct sockaddr_ll me[2];
+struct sockaddr_ll he[2];
 
 struct timeval start, last;
 
@@ -124,7 +130,8 @@
 	p+=4;
 
 	gettimeofday(&now, NULL);
-	err = sendto(s, buf, p-buf, 0, (struct sockaddr*)HE, sizeof(*HE));
+	err = sendto(s, buf, p-buf, 0, (struct sockaddr*)HE, (ah->ar_hln > 8) ?
+		     sizeof(*HE) + ah->ar_hln - 8 : sizeof(*HE));
 	if (err == p-buf) {
 		last = now;
 		sent++;
@@ -174,7 +181,7 @@
 
 	if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
 		count--;
-		send_pack(s, src, dst, &me, &he);
+		send_pack(s, src, dst, &me[0], &he[0]);
 		if (count == 0 && unsolicited)
 			finish();
 	}
@@ -221,7 +228,7 @@
 		return 0;
 	if (ah->ar_pln != 4)
 		return 0;
-	if (ah->ar_hln != me.sll_halen)
+	if (ah->ar_hln != me[0].sll_halen)
 		return 0;
 	if (len < sizeof(*ah) + 2*(4 + ah->ar_hln))
 		return 0;
@@ -232,7 +239,7 @@
 			return 0;
 		if (src.s_addr != dst_ip.s_addr)
 			return 0;
-		if (memcmp(p+ah->ar_hln+4, &me.sll_addr, ah->ar_hln))
+		if (memcmp(p+ah->ar_hln+4, &me[0].sll_addr, ah->ar_hln))
 			return 0;
 	} else {
 		/* DAD packet was:
@@ -250,7 +257,7 @@
 		 */
 		if (src_ip.s_addr != dst.s_addr)
 			return 0;
-		if (memcmp(p, &me.sll_addr, me.sll_halen) == 0)
+		if (memcmp(p, &me[0].sll_addr, me[0].sll_halen) == 0)
 			return 0;
 		if (src.s_addr && src.s_addr != dst_ip.s_addr)
 			return 0;
@@ -266,7 +273,7 @@
 			printf("for %s ", inet_ntoa(dst_ip));
 			s_printed = 1;
 		}
-		if (memcmp(p+ah->ar_hln+4, me.sll_addr, ah->ar_hln)) {
+		if (memcmp(p+ah->ar_hln+4, me[0].sll_addr, ah->ar_hln)) {
 			if (!s_printed)
 				printf("for ");
 			printf("[");
@@ -292,7 +299,7 @@
 	if (quit_on_reply)
 		finish();
 	if(!broadcast_only) {
-		memcpy(he.sll_addr, p, me.sll_halen);
+		memcpy(he[0].sll_addr, p, me[0].sll_halen);
 		unicasting=1;
 	}
 	return 1;
@@ -458,9 +465,9 @@
 		close(probe_fd);
 	};
 
-	me.sll_family = AF_PACKET;
-	me.sll_ifindex = ifindex;
-	me.sll_protocol = htons(ETH_P_ARP);
+	me[0].sll_family = AF_PACKET;
+	me[0].sll_ifindex = ifindex;
+	me[0].sll_protocol = htons(ETH_P_ARP);
 	if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
 		perror("bind");
 		exit(2);
@@ -473,14 +480,37 @@
 			exit(2);
 		}
 	}
-	if (me.sll_halen == 0) {
+	if (me[0].sll_halen == 0) {
 		if (!quiet)
 			printf("Interface \"%s\" is not ARPable (no ll address)\n", device);
 		exit(dad?0:2);
 	}
-
-	he = me;
-	memset(he.sll_addr, -1, he.sll_halen);
+	he[0] = me[0];
+	he[1] = me[1];
+	{
+		struct sysfs_class_device *dev;
+		struct sysfs_attribute *brdcast;
+		char *next_ch;
+
+		dev = sysfs_open_class_device("net", device);
+		if (!dev) {
+			perror("sysfs class device");
+			exit(2);
+		}
+		brdcast = sysfs_get_classdev_attr(dev, "broadcast");
+		if (!brdcast) {
+			perror("sysfs attribute broadcast");
+			exit(2);
+		}
+		if (sysfs_read_attribute(brdcast)) {
+			perror("sysfs read brdcast");
+			exit(2);
+		}
+		for (ch=0; ch<he[0].sll_halen; ch++) {
+			he[0].sll_addr[ch] = strtol(brdcast->value + (ch*3),
+						    &next_ch, 16);
+		}
+	}
 
 	if (!quiet) {
 		printf("ARPING %s ", inet_ntoa(dst));
@@ -500,7 +530,7 @@
 	while(1) {
 		sigset_t sset, osset;
 		unsigned char packet[4096];
-		struct sockaddr_ll from;
+		struct sockaddr_ll from[2];
 		socklen_t alen = sizeof(from);
 		int cc;
 
@@ -513,7 +543,7 @@
 		sigaddset(&sset, SIGALRM);
 		sigaddset(&sset, SIGINT);
 		sigprocmask(SIG_BLOCK, &sset, &osset);
-		recv_pack(packet, cc, &from);
+		recv_pack(packet, cc, &from[0]);
 		if(received == count)
 			exit(0);
 		sigprocmask(SIG_SETMASK, &osset, NULL);

iputils-20070202-idn.patch:
 Makefile |    5 +++++
 ping.c   |   34 ++++++++++++++++++++++++++++++++++
 ping6.c  |   16 ++++++++++++++++
 3 files changed, 55 insertions(+)

--- NEW FILE iputils-20070202-idn.patch ---
Patch by Robert Scheck <redhat at linuxnetz.de> for iputils >= 20070202, which adds
IDN support (umlaut domains) to ping and ping6. For ping this requires the libidn
package installed. For ping6, glibc >= 2.3.4 or glibc 2.3.3 CVS >= 20031001 is
needed.

--- iputils-s20070202/ping.c			2007-03-11 12:22:08.000000000 +0100
+++ iputils-s20070202/ping.c.idn		2007-03-11 14:05:40.000000000 +0100
@@ -58,6 +58,12 @@
  *	This program has to run SUID to ROOT to access the ICMP socket.
  */
 
+#define LIBIDN
+#ifdef LIBIDN
+#include <idna.h>
+#include <locale.h>
+#endif
+
 #include "ping_common.h"
 
 #include <linux/icmp.h>
@@ -115,6 +121,12 @@
 	char *target, hnamebuf[MAXHOSTNAMELEN];
 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
 
+#ifdef LIBIDN
+	char *idn;
+	int rc = 0;
+	setlocale(LC_ALL, "");
+#endif
+
 	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
 	socket_errno = errno;
 
@@ -236,13 +248,35 @@
 			if (argc == 1)
 				options |= F_NUMERIC;
 		} else {
+#ifdef LIBIDN
+			rc = idna_to_ascii_lz (target, &idn, 0);
+			if (rc == IDNA_SUCCESS)
+				hp = gethostbyname (idn);
+			else {
+				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
+				exit(2);
+			}
+			free(idn);
+#else
 			hp = gethostbyname(target);
+#endif
 			if (!hp) {
 				fprintf(stderr, "ping: unknown host %s\n", target);
 				exit(2);
 			}
 			memcpy(&whereto.sin_addr, hp->h_addr, 4);
+#ifdef LIBIDN
+			rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
+			if (rc == IDNA_SUCCESS)
+				strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
+			else {
+				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc);
+				exit(2);
+			}
+			free(idn);
+#else
 			strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
+#endif
 			hnamebuf[sizeof(hnamebuf) - 1] = 0;
 			hostname = hnamebuf;
 		}
--- iputils-s20070202/Makefile			2007-03-11 12:22:08.000000000 +0100 
+++ iputils-s20070202/Makefile.idn		2007-03-11 14:16:56.000000000 +0100
@@ -35,8 +35,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			2007-03-25 13:21:27.000000000 +0200
+++ iputils-s20070202/ping6.c.idn		2007-03-25 13:53:16.000000000 +0200
@@ -66,6 +66,12 @@
  *	More statistics could always be gathered.
  *	This program has to run SUID to ROOT to access the ICMP socket.
  */
+#define IDN
+#ifdef IDN
+#define _GNU_SOURCE
+#include <locale.h>
+#endif
+
 #include "ping_common.h"
 
 #include <linux/filter.h>
@@ -210,6 +216,10 @@
 	int err, csum_offset, sz_opt;
 	static uint32_t scope_id = 0;
 
+#ifdef IDN
+	setlocale(LC_ALL, "");
+#endif
+
 	icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
 	socket_errno = errno;
 
@@ -296,6 +306,9 @@
 
 		memset(&hints, 0, sizeof(hints));
 		hints.ai_family = AF_INET6;
+#ifdef IDN
+		hints.ai_flags = AI_IDN;
+#endif
 		gai = getaddrinfo(target, NULL, &hints, &ai);
 		if (gai) {
 			fprintf(stderr, "unknown host\n");
@@ -328,6 +341,9 @@
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_INET6;
+#ifdef IDN
+	hints.ai_flags = AI_IDN;
+#endif
 	gai = getaddrinfo(target, NULL, &hints, &ai);
 	if (gai) {
 		fprintf(stderr, "unknown host\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Dec 2005 11:15:21 -0000	1.9
+++ .cvsignore	3 Apr 2007 17:06:21 -0000	1.10
@@ -1,3 +1,4 @@
 iputils-ss020927.tar.gz
 rdisc.initd
 ifenslave.tar.gz
+iputils-s20070202.tar.bz2

iputils-20020927-rh.patch:
 Makefile     |    4 ++--
 doc/Makefile |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: iputils-20020927-rh.patch
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils-20020927-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-20020927-rh.patch	9 Sep 2004 06:24:00 -0000	1.1
+++ iputils-20020927-rh.patch	3 Apr 2007 17:06:21 -0000	1.2
@@ -11,21 +11,14 @@
  
 --- iputils/Makefile.rh7	2002-09-20 20:23:55.000000000 +0200
 +++ iputils/Makefile	2004-05-12 15:08:25.638310270 +0200
-@@ -24,14 +24,14 @@
+@@ -24,8 +24,8 @@
  CC=gcc
  # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
  #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
 -CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
+-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
 +#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-+#CFLAGS=$(CCOPT) $(DEFINES) 
++#CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
  
  IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
  IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--all: check-kernel $(TARGETS)
-+all: $(TARGETS)
- 
- 
- tftpd: tftpd.o tftpsubs.o

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/dist/rpms/iputils/FC-6/iputils-ping_cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-ping_cleanup.patch	6 Feb 2006 10:02:24 -0000	1.1
+++ iputils-ping_cleanup.patch	3 Apr 2007 17:06:21 -0000	1.2
@@ -1,25 +1,5 @@
---- iputils/ping6.c.OLD	2006-02-06 10:34:35.000000000 +0100
-+++ iputils/ping6.c	2006-02-06 10:35:38.000000000 +0100
-@@ -353,7 +353,7 @@
- 	hostname = target;
- 
- 	if (ipv6_addr_any(&source.sin6_addr)) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
 --- iputils/ping.c.OLD	2006-02-06 10:34:35.000000000 +0100
 +++ iputils/ping.c	2006-02-06 10:34:35.000000000 +0100
-@@ -253,7 +253,7 @@
- 	}
- 
- 	if (source.sin_addr.s_addr == 0) {
--		int alen;
-+		socklen_t alen;
- 		struct sockaddr_in dst = whereto;
- 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
- 
 @@ -855,9 +855,36 @@
  		case ICMP_SR_FAILED:
  			printf("Source Route Failed\n");
@@ -59,33 +39,6 @@
  			break;
 --- 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
-@@ -67,7 +67,7 @@
- 	int ii, jj, kk;
- 	int pat[16];
- 	char *cp;
--	char *bp = outpack+8;
-+	unsigned char *bp = outpack+8;
- 
- 	for (cp = patp; *cp; cp++) {
- 		if (!isxdigit(*cp)) {
-@@ -393,7 +393,7 @@
- void sock_setbufs(int icmp_sock, int alloc)
- {
- 	int rcvbuf, hold;
--	int tmplen = sizeof(hold);
-+	socklen_t tmplen = sizeof(hold);
- 
- 	if (!sndbuf)
- 		sndbuf = alloc;
-@@ -464,7 +464,7 @@
- 
- 	if (!(options & F_PINGFILLED)) {
- 		int i;
--		char *p = outpack+8;
-+		unsigned char *p = outpack+8;
- 
- 		/* Do not forget about case of small datalen,
- 		 * fill timestamp area too!
 @@ -819,7 +819,7 @@
  	}
  	if (pipesize > 1)


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- iputils.spec	13 Sep 2006 11:42:23 -0000	1.43
+++ iputils.spec	3 Apr 2007 17:06:21 -0000	1.44
@@ -1,42 +1,32 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
-Version: 20020927
-Release: 41%{?dist}
+Version: 20070202
+Release: 1%{?dist}
 License: BSD
+URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
-Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
+Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Patch0: iputils-20020927-rh.patch
-Patch1: iputils-20020124-ping_sparcfix.patch
-Patch2: iputils-20020124-rdisc-server.patch
 Patch3: iputils-20020124-countermeasures.patch
 Patch4: iputils-20020927-addrcache.patch
 Patch5: iputils-20020927-ping-subint.patch
-Patch6: iputils-20020927-icmp_seq.patch
-Patch7: iputils-glibckernheaders.patch
-Patch8: iputils-20020927-headers.patch
 Patch9: iputils-20020927-unaligned.patch
-Patch10: iputils-20020927-inet_pton.patch
-Patch11: iputils-retvals.patch
-#Patch12: iputils-arping.patch
 Patch13: iputils-20020927-ia64_align.patch
-Patch14: iputils-arping_buf_overflow.patch
 Patch15: iputils-20020927-12-arping.patch
-Patch16: iputils-getaddrinfo.patch
-Patch17: iputils-flood.patch
-Patch18: iputils-ping-168166.patch
-Patch19: iputils-ipv6-hoplimit.patch
-Patch20: iputils-gcc41.patch
 Patch21: iputils-ping_cleanup.patch
 Patch22: iputils-ifenslave.patch
-Patch23: iputils-20020927-trace_stop.patch
+Patch25: iputils-20020927-arping-infiniband.patch
+Patch26: iputils-20070202-idn.patch
 
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: docbook-utils perl-SGMLSpm
-BuildPreReq: glibc-kernheaders >= 2.4-8.19
-PreReq: chkconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: docbook-utils perl-SGMLSpm
+BuildRequires: glibc-kernheaders >= 2.4-8.19
+BuildRequires: libsysfs-devel
+BuildRequires: libidn-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -45,32 +35,19 @@
 the target machine is alive and receiving network traffic.
 
 %prep
-%setup -q -a 1 -n %{name}
+%setup -q -a 1 -n %{name}-s%{version}
 
 %patch0 -p1 -b .rh
-%patch1 -p1 -b .ping_sparcfix
-%patch2 -p1 -b .rdisc-server
 %patch3 -p1 -b .countermeasures
 %patch4 -p1 -b .addrcache
 %patch5 -p1 -b .ping-subint
-%patch6 -p1 -b .icmp_seq
-%patch7 -p1 -b .glibckernheaders
-%patch8 -p1 -b .headers
 %patch9 -p1 -b .unaligned
-%patch10 -p1 -b .inet_pton
-%patch11 -p1 -b .retvals
-#%patch12 -b .arping
 %patch13 -p1 -b .align
-%patch14 -p1 -b .buf_overflow
 %patch15 -p1 -b .timeout
-%patch16 -p1 -b .getaddrinfo
-%patch17 -p1 -b .flood
-%patch18 -p1 -b .memset
-%patch19 -p1 -b .hoplimit
-%patch20 -p1 -b .gcc41
 %patch21 -p1 -b .cleanup
 %patch22 -p1 -b .addr
-%patch23 -p1 -b .trace_stop
+%patch25 -p1 -b .infiniband
+%patch26 -p1 -b .idn
 
 %build
 %ifarch s390 s390x
@@ -103,13 +80,11 @@
 install -c ping6		${RPM_BUILD_ROOT}/bin/
 install -c tracepath		${RPM_BUILD_ROOT}/bin/
 install -c tracepath6		${RPM_BUILD_ROOT}/bin/
-#install -c traceroute6		${RPM_BUILD_ROOT}/bin/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -sf /bin/ping6 ${RPM_BUILD_ROOT}%{_sbindir}
 ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}
 ln -sf /bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir}
-#ln -sf /bin/traceroute6 ${RPM_BUILD_ROOT}%{_sbindir}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 install -c doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
@@ -121,7 +96,6 @@
 ln -s %{_mandir}/man8/ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s %{_mandir}/man8/tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
-#install service
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
 
@@ -144,7 +118,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc RELNOTES README.bonding
 %{_sbindir}/clockdiff
 %ifos linux
@@ -161,15 +135,20 @@
 %attr(4755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
-#%attr(4755,root,root)/bin/traceroute6
 %{_sbindir}/ping6
 %{_sbindir}/tracepath
 %{_sbindir}/tracepath6
-#%{_sbindir}/traceroute6
 %attr(0644,root,root) %{_mandir}/man8/*
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Tue Apr  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-1
+- upgrade to new upstream 20070202
+- old and unused patches removed
+- resolves: #213897: ifenslave man page from iputils-20020927-41.fc6 is not a man page
+- resolves: #213717: arping doesn't work on InfiniBand ipoib interfaces
+- resolves: #220302: LTC29372-ping6 doesn't define the destination address along RFC3484
+
 * Wed Sep 13 2006 Radek Vokal <rvokal at redhat.com> - 20020927-41
 - new ifenslave/bonding documentation
 
@@ -400,7 +379,7 @@
 - add ifenslave.
 
 * Thu Feb  3 2000 Elliot Lee <sopwith at redhat.com>
-- List /usr/sbin/rdisc in %files list.
+- List /usr/sbin/rdisc in %%files list.
 
 * Thu Jan 27 2000 Jeff Johnson <jbj at redhat.com>
 - add remaining binaries.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Sep 2006 11:42:24 -0000	1.12
+++ sources	3 Apr 2007 17:06:21 -0000	1.13
@@ -1,3 +1,3 @@
-b5493f7a2997130a4f86c486c9993b86  iputils-ss020927.tar.gz
 349c02b907d61a143876f85cbd006c89  rdisc.initd
 6c3f8bffe792b2b49a99aefcf730e72f  ifenslave.tar.gz
+1d38fb3cfc2b71496e43cf646bfc1d6e  iputils-s20070202.tar.bz2


--- iputils-20020124-ping_sparcfix.patch DELETED ---


--- iputils-20020124-rdisc-server.patch DELETED ---


--- iputils-20020927-headers.patch DELETED ---


--- iputils-20020927-icmp_seq.patch DELETED ---


--- iputils-20020927-inet_pton.patch DELETED ---


--- iputils-20020927-trace_stop.patch DELETED ---


--- iputils-arping.patch DELETED ---


--- iputils-arping_buf_overflow.patch DELETED ---


--- iputils-flood.patch DELETED ---


--- iputils-gcc41.patch DELETED ---


--- iputils-getaddrinfo.patch DELETED ---


--- iputils-glibckernheaders.patch DELETED ---


--- iputils-ipv6-hoplimit.patch DELETED ---


--- iputils-ping-168166.patch DELETED ---


--- iputils-retvals.patch DELETED ---


