]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
iputils: Apply patches in specified order.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Feb 2010 15:47:17 +0000 (16:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Feb 2010 15:47:17 +0000 (16:47 +0100)
Remove buggy patch.

pkgs/core/iputils/iputils.nm
pkgs/core/iputils/patches/iputils-ifenslave-20090202.patch [deleted file]

index 6640a3dce0e16fd43933d5461d7fa1049fd9d227..a65e78accb1951376b5918f269952f9ccb98464e 100644 (file)
@@ -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 (file)
index 662d69d..0000000
+++ /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)