From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Feb 2010 15:47:17 +0000 (+0100)
Subject: iputils: Apply patches in specified order.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adb3e60c21d151b7cd71222d7b454b7f90260e69;p=ipfire-3.x.git

iputils: Apply patches in specified order.

Remove buggy patch.
---

diff --git a/pkgs/core/iputils/iputils.nm b/pkgs/core/iputils/iputils.nm
index 6640a3dce..a65e78acc 100644
--- a/pkgs/core/iputils/iputils.nm
+++ b/pkgs/core/iputils/iputils.nm
@@ -46,6 +46,19 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.bz2
 
+PKG_PATCHES    = $(THISAPP)-addrcache.patch
+PKG_PATCHES   += $(THISAPP)-arping-infiniband.patch
+PKG_PATCHES   += $(THISAPP)-arping_timeout.patch
+PKG_PATCHES   += $(THISAPP)-countermeasures.patch
+PKG_PATCHES   += $(THISAPP)-idn.patch
+PKG_PATCHES   += $(THISAPP)-open-max.patch
+PKG_PATCHES   += $(THISAPP)-ping-subint.patch
+PKG_PATCHES   += $(THISAPP)-ping_cleanup.patch
+PKG_PATCHES   += $(THISAPP)-rh.patch
+PKG_PATCHES   += $(THISAPP)-traffic_class.patch
+PKG_PATCHES   += $(THISAPP)-warnings.patch
+PKG_PATCHES   += $(THISAPP)-output.patch
+
 ###############################################################################
 # Installation Details
 ###############################################################################
diff --git a/pkgs/core/iputils/patches/iputils-ifenslave-20090202.patch b/pkgs/core/iputils/patches/iputils-ifenslave-20090202.patch
deleted file mode 100644
index 662d69da8..000000000
--- a/pkgs/core/iputils/patches/iputils-ifenslave-20090202.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- iputils/ifenslave.c.addr	2006-03-29 15:00:24.000000000 +0200
-+++ iputils/ifenslave.c	2006-03-29 15:02:01.000000000 +0200
-@@ -524,8 +524,8 @@
- 	if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0)
- 		return -1;
- 	printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n",
--	       ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1],
--	       ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]);
-+	       ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3],
-+	       ifr.ifr_addr.sa_data[4], ifr.ifr_addr.sa_data[5]);
- 
- 	strcpy(ifr.ifr_name, ifname);
- 	if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)