Version bump, bug #260480, thank Jeroen Roovers for report.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 12 insertions, 109 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 6b0afdf25ceb..af69666860d8 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.22 2009/02/26 17:01:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.23 2009/02/28 14:07:44 pva Exp $
+
+*ipset-2.4.9 (28 Feb 2009)
+
+  28 Feb 2009; Peter Volkov <pva@gentoo.org>
+  -files/ipset-2.4.8-use-new-hash.patch, -ipset-2.4.8.ebuild,
+  +ipset-2.4.9.ebuild:
+  Version bump, bug #260480, thank Jeroen Roovers for report.
 
 *ipset-2.4.8 (26 Feb 2009)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 1e9741a1b1f2..7a2eaf23ab37 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,12 +1,11 @@
 AUX ipset-2.4.2-glibc28-fix.patch 2797 RMD160 765f4fe80ee2ac0a5109726790af161aa313e095 SHA1 5b59c99d823067a6553b0d7b1e03989035d068eb SHA256 c3faf45b7a05bd4ebb9d6c633459cd6fadf6c5d43cd6169414ade509d2608769
 AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6a SHA1 213693f41ba7504b4485669b4f12cfa35f4380ba SHA256 3c64df05ecfcc361e92389e9c4e9a857be5b8097855311a7c3c7f6cf731f458a
-AUX ipset-2.4.8-use-new-hash.patch 3226 RMD160 48641c5afa30e2150e6e1305ea16f3b5d50d63bd SHA1 1c9da8b4fa58626d7cc30b89b04ba8257ec96116 SHA256 0d0281cf8e50db85e1c335097c90ca7e109e29ed62b8d7be0d73335e87764b63
 DIST ipset-2.3.0-20070828.tar.bz2 29442 RMD160 f87edd407fdda85d8fefb8ca31865a22a65753a4 SHA1 b831b0a0f6a7987b2eda8f7b1545da8b191673e8 SHA256 216f9bc128c2d0afab549baf1586ab9f2359e32fd1ccfe5ed0dc57e193d8f66a
 DIST ipset-2.3.1-20080612.tar.bz2 31821 RMD160 9de9f2e781e6b5256e868acabb24445b58c72c76 SHA1 b6a9ec4272d8e47ad2addde61ca1e91fd2dbe078 SHA256 86bbe1116e26ed0e33b0944f0f9314ab3321699e93ed29e10c2dc72b9d1721b8
 DIST ipset-2.3.3a.tar.bz2 59876 RMD160 1f38bb569d970a6f4161feacb48f0636c77399e9 SHA1 b20ba40bf46024570a62465fa5a71881d535aaf7 SHA256 b671d707ec83fd7d75b1107154a919b065346bcf650131e22c0f7286971ce6ee
 DIST ipset-2.4.2.tar.bz2 65862 RMD160 8c86e7eea45449809cc993de0baca7095c566aa9 SHA1 a97a195cb3b55b7a7417faa63241b8dc5d6b622f SHA256 5e8b2bf50dc3147efc1652a8f38e600b85dc1917d0430d5c9b42de0d80519889
 DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928
-DIST ipset-2.4.8.tar.bz2 66961 RMD160 8945b8b3b1ec944eb42146fef4163f2c5927e21b SHA1 767deb2101796f09489aae8aca1c22447a46b6cc SHA256 0a4a086655e1f4f387c05b9414b8d60ed17330317eb7d01a5aed73c2f6d2afa7
+DIST ipset-2.4.9.tar.bz2 67180 RMD160 16317963a096f580381d3e15d5380918649246ca SHA1 17314e5a82e5887af93b214058ea9e70be6444c5 SHA256 0f616c673da457cc0db4f9a1fceb65cfd1f39ed2a21abf93cd2e2209634ba022
 DIST ipset-20070401.tar.bz2 28279 RMD160 a51faccf276b5c90a83de1e3a0c5af9d2a93975e SHA1 b2ac74384513f4c235bb55e02dc6931f501dd9d5 SHA256 0a0c8b96c979148d652bc4b9b6ce601144abecc8c3aceba50f898c58edab1c90
 DIST patch-o-matic-ng-20070401.tar.bz2 142585 RMD160 34e5c2ad672b7384867d2953bc889c9526ebb754 SHA1 b8cad77065a97d3fd8f1740fd75736eac2c0117f SHA256 8176cfdc36bcf015a2a662589e96bdf23d85240c8ef1f14cad76eb08777700f0
 DIST patch-o-matic-ng-20071021.tar.bz2 136199 RMD160 3e211f5a2c930d582d0d7e4d47b1f6313b68e302 SHA1 303295dc853dd3947ae4e2c98c3b1ab69c276cf8 SHA256 558d3f1cb35e92faedc067bb34073f77db065c7a5c88ce1d4d6ea5588266e3ae
@@ -17,6 +16,6 @@ EBUILD ipset-2.3.1.20080612.ebuild 2277 RMD160 40030a62ebb0b99a9bed13922b83787d3
 EBUILD ipset-2.3.3a.ebuild 2564 RMD160 72eb03f8baa17e89d487d96db12e1f54fff69a12 SHA1 73ef5e17609ebf4b877f4bdf75936aaa52b4a44a SHA256 02efd65e0add02d9e9088aecabf040cdf312b9132c977198d321d4036bbf063d
 EBUILD ipset-2.4.2.ebuild 2616 RMD160 744a45070b5341cb8d26165088eca20ce1e655e0 SHA1 75dea2364ffb0910bd487bc1f2ff66d194db1c5c SHA256 b8ed0e0a6a2d0e2fdb40bacbac3d75703c7a3fc03e7a69e277b8a33f57b4ca3b
 EBUILD ipset-2.4.7.ebuild 2606 RMD160 673053a2619884609d861ebfb11a82b09f0f26b8 SHA1 aee72df26dbd066038b2485b5d6262eb6da9fe69 SHA256 10fe481936e9c8d8f3b6890d9d6415892486de9a01823ead3fb02cf926dfee12
-EBUILD ipset-2.4.8.ebuild 2664 RMD160 2bfdd84823e5e2db2c2390d2b4b50762ceb24107 SHA1 5245b18bdb31d838969572cd7124d16b3a192add SHA256 d37dacc3604ac2537058814ed6781352d4e9f5e106de03700c2cc24db9949b6c
-MISC ChangeLog 4342 RMD160 486d65b21ac968d53fbbd9c7a830aa7447d653ad SHA1 e7e164c3ddff787e1ac8015f0769dd78f39a57f3 SHA256 d1316fa338957b2a6bd41d8f6a1351242009e361f1813790aca6165944d11d0c
+EBUILD ipset-2.4.9.ebuild 2611 RMD160 4d09ea36c6d9c97bb69047a9d64bc42641a0e962 SHA1 9991a6166ce8d72f90e35b7ef29bf77d59b48b64 SHA256 0310cab3c77d7425c61eaa7e094001ecc87563298ce0b18159d799adacd3dad8
+MISC ChangeLog 4563 RMD160 8ada265f37f85cd9320d726c022ff813ea670d27 SHA1 648f48b627ebd722655639fce0102717e5f72e6a SHA256 63babd8d42700c1fcf2e63c04f5110657ee386bb3ed784a7646df0957cfce9d3
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch b/net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch
deleted file mode 100644
index a90515331ce4..000000000000
--- a/net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-Date: Wed, 11 Feb 2009 13:00:35 +0000 (+0100)
-Subject: Use the new hash really.
-X-Git-Tag: v2.4.9~1
-X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ipset.git;a=commitdiff_plain;h=31c93a74639077ee39b448ff47f446b4864cfaea
-
-Use the new hash really.
-
-References to the old include file replaced with new one in order to
-really use the new Jenkins' hash function.
----
-
-diff --git a/kernel/ChangeLog b/kernel/ChangeLog
-index 1ed0fbb..1c6e650 100644
---- a/kernel/ChangeLog
-+++ b/kernel/ChangeLog
-@@ -1,3 +1,7 @@
-+2.4.9
-+  - References to the old include file replaced with new one in order to
-+    really use the new Jenkins' hash function.
-+
- 2.4.8
-   - The Jenkins' hash lookup2() replaced with Jenkins' faster/better lookup3()
-     hash function.
-diff --git a/kernel/ip_set.c b/kernel/ip_set.c
-index f60a63e..f52647f 100644
---- a/kernel/ip_set.c
-+++ b/kernel/ip_set.c
-@@ -19,7 +19,7 @@
- #include <linux/ip.h>
- #include <linux/skbuff.h>
- #include <linux/random.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <linux/capability.h>
- #include <asm/uaccess.h>
-diff --git a/kernel/ip_set_iphash.c b/kernel/ip_set_iphash.c
-index b1bccc1..aac3eec 100644
---- a/kernel/ip_set_iphash.c
-+++ b/kernel/ip_set_iphash.c
-@@ -11,7 +11,7 @@
- #include <linux/moduleparam.h>
- #include <linux/ip.h>
- #include <linux/skbuff.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
-diff --git a/kernel/ip_set_ipporthash.c b/kernel/ip_set_ipporthash.c
-index 2352858..c41c0a8 100644
---- a/kernel/ip_set_ipporthash.c
-+++ b/kernel/ip_set_ipporthash.c
-@@ -13,7 +13,7 @@
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/skbuff.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
-diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_ipportiphash.c
-index e0725d9..166bec4 100644
---- a/kernel/ip_set_ipportiphash.c
-+++ b/kernel/ip_set_ipportiphash.c
-@@ -13,7 +13,7 @@
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/skbuff.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
-diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_ipportnethash.c
-index 267370a..fe36c58 100644
---- a/kernel/ip_set_ipportnethash.c
-+++ b/kernel/ip_set_ipportnethash.c
-@@ -13,7 +13,7 @@
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/skbuff.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
-diff --git a/kernel/ip_set_nethash.c b/kernel/ip_set_nethash.c
-index 268fe6a..27267d9 100644
---- a/kernel/ip_set_nethash.c
-+++ b/kernel/ip_set_nethash.c
-@@ -11,7 +11,7 @@
- #include <linux/moduleparam.h>
- #include <linux/ip.h>
- #include <linux/skbuff.h>
--#include <linux/jhash.h>
-+#include <linux/netfilter_ipv4/ip_set_jhash.h>
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
diff --git a/net-firewall/ipset/ipset-2.4.8.ebuild b/net-firewall/ipset/ipset-2.4.9.ebuild
index c519712dd4f2..e1622181017a 100644
--- a/net-firewall/ipset/ipset-2.4.8.ebuild
+++ b/net-firewall/ipset/ipset-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.8.ebuild,v 1.1 2009/02/26 17:01:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.9.ebuild,v 1.1 2009/02/28 14:07:44 pva Exp $
 
 inherit eutils versionator toolchain-funcs linux-mod linux-info
 
@@ -42,7 +42,6 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.4.7-LDFLAGS.patch"
-	epatch "${FILESDIR}/${PN}-2.4.8-use-new-hash.patch"
 }
 
 pkg_setup() {