3 files changed, 90 insertions, 2 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 788d2ffb83bd..94ab72fc1358 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.16 2008/06/25 03:19:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.17 2008/08/14 00:06:25 robbat2 Exp $
+
+*ipset-2.3.3a (14 Aug 2008)
+
+  14 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +ipset-2.3.3a.ebuild:
+  Bug #233763, version bump to resolve glibc-2.8 issues. Upstream also now
+  includes modules buildable without patching the kernel.
 
 *ipset-2.3.1.20080612 (25 Jun 2008)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 668e9f71e52b..f57d00c68a66 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,5 +1,6 @@
 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-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
@@ -7,5 +8,6 @@ DIST patch-o-matic-ng-20080617.tar.bz2 145630 RMD160 75b5afc798acef8efe877b3dff8
 EBUILD ipset-2.2.9.20070401.ebuild 1341 RMD160 8783afb65cd59b4dc037c24054ef14b7301a72b3 SHA1 10cf72ab7cdbbe77dc2f05f885fe868087212762 SHA256 9d533099035d27a789323db57b043533d68faf7a4dd184285760dc95db521680
 EBUILD ipset-2.3.0.20070828-r2.ebuild 2263 RMD160 d85e331bf7f67489dad5e20119db9722384b6b7f SHA1 e7177918a829a3797a63884e60de0b4616ff1383 SHA256 d8885d975f1e8a679136706ee0b0b6f068677fc136e00ac5a41da4be84084e19
 EBUILD ipset-2.3.1.20080612.ebuild 2277 RMD160 40030a62ebb0b99a9bed13922b83787d379551ea SHA1 1df16cbf2f777bd7e064a3a5b2f6adaed5edf00a SHA256 36dd86162d140190c6cf9d2034d28c5d64a33ed1e7c85f154e89fd81f22fcd8a
-MISC ChangeLog 3137 RMD160 7d762a95bbc04c8d42cd070e6ac8537317cd756b SHA1 a0b846ef56f02bcfc318d5fb59218c014a265e8a SHA256 7c1045d50eb88cff71b9fc84edca91746e4e5f4773a49e04bf262733f95dafc8
+EBUILD ipset-2.3.3a.ebuild 2289 RMD160 77c5ac56e923568bba82b3b9e94d23925cf33278 SHA1 6f782fae88f929edde6969d39948a70c7e235939 SHA256 69115d8d3cd490da85a7a12497fc655aa746c292591d09654ead79ba341a8762
+MISC ChangeLog 3375 RMD160 b356e1d39ccaffa2f9cc251f07bd47ee9cef7f20 SHA1 b817ac27cecd49146522f596622f413f8dce88d7 SHA256 89f4d2b1849ae45d7a2885c4ff65b6381803776856160cb740eae57a1621657b
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/ipset-2.3.3a.ebuild b/net-firewall/ipset/ipset-2.3.3a.ebuild
new file mode 100644
index 000000000000..d97e3cd8f369
--- /dev/null
+++ b/net-firewall/ipset/ipset-2.3.3a.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v 1.1 2008/08/14 00:06:25 robbat2 Exp $
+
+inherit eutils versionator toolchain-funcs linux-mod
+
+DESCRIPTION="IPset tool for iptables, successor to ippool."
+HOMEPAGE="http://ipset.netfilter.org/"
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+RDEPEND=">=net-firewall/iptables-1.4.1"
+DEPEND="${RDEPEND}"
+
+# configurable from outside
+[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256
+[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024
+BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}"
+# module fun
+BUILD_TARGETS="all"
+MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel"
+MODULE_NAMES=""
+for i in ip_set{,_{{ip,port,macip}map,{ip,net,ipport}hash,iptree{,map}}} \
+	ipt_{SET,set}; do
+	MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
+done
+# sanity
+CONFIG_CHECK="NETFILTER"
+ERROR_CFG="ipset needs netfilter support in your kernel."
+
+src_unpack() {
+	unpack ${A}
+	sed -i \
+		-e 's/KERNELDIR/(KERNELDIR)/g' \
+		-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
+		-e '/^all::/iV ?= 0' \
+		-e '/^all::/iKBUILD_OUTPUT ?=' \
+		-e 's/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/' \
+		"${S}"/kernel/Makefile
+	sed -i \
+		-e '/asm.semaphore.h/d' \
+		"${S}"/kernel/ip_set.c
+}
+
+pkg_setup() {
+	#use modules && \
+		linux-mod_pkg_setup
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/$(get_libdir)"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	export myconf
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"
+
+	#if use modules; then
+		einfo "Building kernel modules"
+		cd "${S}/kernel"
+		export KERNELDIR="${KERNEL_DIR}"
+		linux-mod_src_compile || die "failed to build modules"
+	#fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
+
+	#if use modules; then
+		einfo "Installing kernel modules"
+		cd "${S}/kernel"
+		export KERNELDIR="${KERNEL_DIR}"
+		linux-mod_src_install
+	#fi
+}