rpms/iputils/F-13 iputils-20071127-flowlabel.patch, NONE, 1.1 iputils.spec, 1.67, 1.68

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/iputils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20042

Modified Files:
	iputils.spec 
Added Files:
	iputils-20071127-flowlabel.patch 
Log Message:
* Wed Jun 30 2010 Jiri Skala <jskala at redhat.com> - 20071127-11
- fixes #583976 - ping6 does not support -F flowlabel option
- fixes nvr upgrade issue


iputils-20071127-flowlabel.patch:
 Makefile        |    2 +-
 in6_flowlabel.h |   40 ++++++++++++++++++++++++++++++++++++++++
 ping6.c         |    2 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

--- NEW FILE iputils-20071127-flowlabel.patch ---
diff -up iputils-s20071127/in6_flowlabel.h.flowlabel iputils-s20071127/in6_flowlabel.h
--- iputils-s20071127/in6_flowlabel.h.flowlabel	2010-05-11 15:54:04.133396107 +0200
+++ iputils-s20071127/in6_flowlabel.h	2010-05-11 15:54:04.133396107 +0200
@@ -0,0 +1,40 @@
+/*
+   It is just a stripped copy of the kernel header "linux/in6.h"
+
+   "Flow label" things are still not defined in "netinet/in*.h" headers,
+   but we cannot use "linux/in6.h" immediately because it currently
+   conflicts with "netinet/in.h" .
+*/
+
+struct in6_flowlabel_req
+{
+	struct in6_addr	flr_dst;
+	__u32	flr_label;
+	__u8	flr_action;
+	__u8	flr_share;
+	__u16	flr_flags;
+	__u16 	flr_expires;
+	__u16	flr_linger;
+	__u32	__flr_pad;
+	/* Options in format of IPV6_PKTOPTIONS */
+};
+
+#define IPV6_FL_A_GET	0
+#define IPV6_FL_A_PUT	1
+#define IPV6_FL_A_RENEW	2
+
+#define IPV6_FL_F_CREATE	1
+#define IPV6_FL_F_EXCL		2
+
+#define IPV6_FL_S_NONE		0
+#define IPV6_FL_S_EXCL		1
+#define IPV6_FL_S_PROCESS	2
+#define IPV6_FL_S_USER		3
+#define IPV6_FL_S_ANY		255
+
+#define IPV6_FLOWINFO_FLOWLABEL		0x000fffff
+#define IPV6_FLOWINFO_PRIORITY		0x0ff00000
+
+#define IPV6_FLOWLABEL_MGR	32
+#define IPV6_FLOWINFO_SEND	33
+
diff -up iputils-s20071127/Makefile.flowlabel iputils-s20071127/Makefile
--- iputils-s20071127/Makefile.flowlabel	2010-05-11 15:54:04.040637709 +0200
+++ iputils-s20071127/Makefile	2010-05-11 15:54:04.133396107 +0200
@@ -34,7 +34,7 @@ ping: ping.o ping_common.o
 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
+ping.o ping6.o ping_common.o: ping_common.h in6_flowlabel.h
 tftpd.o tftpsubs.o: tftp.h
 
 rdisc_srv: rdisc_srv.o
diff -up iputils-s20071127/ping6.c.flowlabel iputils-s20071127/ping6.c
--- iputils-s20071127/ping6.c.flowlabel	2010-05-11 15:54:04.118364651 +0200
+++ iputils-s20071127/ping6.c	2010-05-11 15:56:19.147615754 +0200
@@ -75,6 +75,8 @@ char copyright[] =
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 
+#include "in6_flowlabel.h"
+
 #ifndef SOL_IPV6
 #define SOL_IPV6 IPPROTO_IPV6
 #endif


Index: iputils.spec
===================================================================
RCS file: /cvs/extras/rpms/iputils/F-13/iputils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- iputils.spec	5 Mar 2010 08:55:28 -0000	1.67
+++ iputils.spec	30 Jun 2010 08:23:50 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20071127
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -27,6 +27,7 @@ Patch13: iputils-20071127-warnings.patch
 Patch14: iputils-20071127-typing_bug.patch
 Patch15: iputils-20071127-corr_type.patch
 Patch16: iputils-20071127-timeout.patch
+Patch17: iputils-20071127-flowlabel.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -63,6 +64,7 @@ the target machine is alive and receivin
 %patch14 -p1 -b .typing_bug
 %patch15 -p1 -b .corr_type
 %patch16 -p1 -b .timeout
+%patch17 -p1 -b .flowlabel
 
 %build
 %ifarch s390 s390x
@@ -152,6 +154,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Wed Jun 30 2010 Jiri Skala <jskala at redhat.com> - 20071127-11
+- fixes #583976 - ping6 does not support -F flowlabel option
+- fixes nvr upgrade issue
+
 * Fri Mar 05 2010 Jiri Skala <jskala at redhat.com> - 20071127-10
 - fixes #557308 - arping ignores the deadline option