Fixed gethostbyname alignment issue on hppa, bug #260481, thank Antixrict for report and work with upstream. Removed old.

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

8 files changed, 30 insertions, 336 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index af69666860d8..74cf4bb81a7d 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,16 @@
 # 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.23 2009/02/28 14:07:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.24 2009/03/03 13:15:52 pva Exp $
+
+*ipset-2.4.9-r1 (03 Mar 2009)
+
+  03 Mar 2009; Peter Volkov <pva@gentoo.org>
+  +files/ipset-2.4.9-gethostbyname-align.patch,
+  -ipset-2.3.0.20070828-r2.ebuild, -ipset-2.3.1.20080612.ebuild,
+  -ipset-2.3.3a.ebuild, -ipset-2.4.2.ebuild, -ipset-2.4.9.ebuild,
+  +ipset-2.4.9-r1.ebuild:
+  Fixed gethostbyname alignment issue on hppa, bug #260481, thank Antixrict
+  for report and work with upstream. Removed old.
 
 *ipset-2.4.9 (28 Feb 2009)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 7a2eaf23ab37..826f307cbfa1 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,21 +1,12 @@
 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
-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
+AUX ipset-2.4.9-gethostbyname-align.patch 438 RMD160 e68e00cecc037a0171b5434288b69ffd0d63b294 SHA1 bd3259f0f5ec3c300c1217e3bce8cc4bd807d01b SHA256 42e214ab4a9ed440f7f04f60078f23e0bd4843f22d0e4f25d3e65259425492d9
 DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928
 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
-DIST patch-o-matic-ng-20080617.tar.bz2 145630 RMD160 75b5afc798acef8efe877b3dff8705d70a3fbd46 SHA1 af24aea263873da9c89d075faf04e25d10b83780 SHA256 491b77ab61e9ee2f066ba178b4b7ff1b2ca9631757f1af182c0c70091155fe52
 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
-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.9.ebuild 2611 RMD160 4d09ea36c6d9c97bb69047a9d64bc42641a0e962 SHA1 9991a6166ce8d72f90e35b7ef29bf77d59b48b64 SHA256 0310cab3c77d7425c61eaa7e094001ecc87563298ce0b18159d799adacd3dad8
-MISC ChangeLog 4563 RMD160 8ada265f37f85cd9320d726c022ff813ea670d27 SHA1 648f48b627ebd722655639fce0102717e5f72e6a SHA256 63babd8d42700c1fcf2e63c04f5110657ee386bb3ed784a7646df0957cfce9d3
+EBUILD ipset-2.4.9-r1.ebuild 2674 RMD160 703b81042b8578d2299fd212df53ad08d1f7fe4b SHA1 503bab12a3e8abcd43fc3ea2ffbc527350442357 SHA256 2e094968416a17cb7d1df50469b4ca2c9d314d286ff323a584cfb51bba28f41b
+MISC ChangeLog 4971 RMD160 2a4742f5e795ca71f74c5869fa117b681e3c1133 SHA1 01d9b6e9f78df7ef070ed67285987d989ba0e6ce SHA256 030bc52bbc3cbbb208faf57515d099e99b69c9a02230710719f0cd04ffbf9b49
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/files/ipset-2.4.9-gethostbyname-align.patch b/net-firewall/ipset/files/ipset-2.4.9-gethostbyname-align.patch
new file mode 100644
index 000000000000..cbc2c39f7750
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-2.4.9-gethostbyname-align.patch
@@ -0,0 +1,14 @@
+diff --git a/ipset.c b/ipset.c
+index ba007e5..de6a4ec 100644
+--- a/ipset.c
++++ b/ipset.c
+@@ -626,7 +626,8 @@ void parse_ip(const char *str, ip_set_ip_t * ip)
+ 				   "host/network `%s' resolves to serveral ip-addresses. "
+ 				   "Please specify one.", str);
+ 
+-		*ip = ntohl(((struct in_addr *) host->h_addr_list[0])->s_addr);
++		memcpy(&addr, host->h_addr_list[0], sizeof(struct in_addr));
++		*ip = ntohl(addr.s_addr);
+ 		return;
+ 	}
+ 
diff --git a/net-firewall/ipset/ipset-2.3.0.20070828-r2.ebuild b/net-firewall/ipset/ipset-2.3.0.20070828-r2.ebuild
deleted file mode 100644
index d3dc2181a3bb..000000000000
--- a/net-firewall/ipset/ipset-2.3.0.20070828-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.0.20070828-r2.ebuild,v 1.1 2007/11/14 05:50:21 pva Exp $
-
-inherit eutils versionator toolchain-funcs
-
-POM_PV="20071021"
-
-MY_PV=$(replace_version_separator 3 -)
-DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
-HOMEPAGE="http://ipset.netfilter.org/"
-SRC_URI="http://ipset.netfilter.org/${PN}-${MY_PV}.tar.bz2
-		http://ipset.netfilter.org/patch-o-matic-ng-${POM_PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-RDEPEND=">=net-firewall/iptables-1.3"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/ipset-${MY_PV%-*}
-
-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"
-	myconf="${myconf} KERNEL_DIR=${WORKDIR}/patch-o-matic-ng/patchlets/set/linux-2.6"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} || die "failed to build"
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${myconf} install || die "failed to package"
-}
-
-pkg_postinst() {
-	elog "To use ${PN} you must have the ip_set kernel module compiled!"
-	elog "To patch you kernel run:"
-	elog
-	elog " # emerge --config ipset"
-	elog
-	elog "And follow on-screen instructions"
-}
-
-pkg_config() {
-	cd "${ROOT}${PORTAGE_TMPDIR}"
-	[ -d patch-o-matic-ng ] && {
-		einfo "${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory exist. Cleaning it..." ;
-		rm -rf patch-o-matic-ng;
-	}
-	mkdir patch-o-matic-ng && cd patch-o-matic-ng
-
-	IPTVERINS=`echo $(best_version net-firewall/iptables) | \
-	sed -n 's:^[^/]*/[[:alpha:]]*-\([0-9]\+\([.][0-9]\+\)*[a-z]\?\(_\(pre\|p\|beta\|alpha\|rc\)[0-9]*\)*\)\(-r[0-9]\+\)\?$:\1:p'`
-
-	einfo "Unpacking patch-o-matic-ng-${POM_PV} and iptables-${IPTVERINS} sources"
-	unpack {patch-o-matic-ng-${POM_PV},iptables-${IPTVERINS}}.tar.bz2
-
-	einfo "I'm going to patch sources in ${ROOT}usr/src/linux"
-	cd patch-o-matic-ng
-	KERNEL_DIR="${ROOT}"usr/src/linux IPTABLES_DIR=../iptables-${IPTVERINS} ./runme set
-
-	einfo "Cleaning ${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory"
-	rm -rf "${ROOT}${PORTAGE_TMPDIR}"/patch-o-matic-ng
-}
diff --git a/net-firewall/ipset/ipset-2.3.1.20080612.ebuild b/net-firewall/ipset/ipset-2.3.1.20080612.ebuild
deleted file mode 100644
index 84221d7f554d..000000000000
--- a/net-firewall/ipset/ipset-2.3.1.20080612.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.1.20080612.ebuild,v 1.1 2008/06/25 03:19:51 robbat2 Exp $
-
-inherit eutils versionator toolchain-funcs
-
-POM_PV="20080617"
-
-MY_PV="$(replace_version_separator 3 - "${PV/p/}")"
-DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
-HOMEPAGE="http://ipset.netfilter.org/"
-SRC_URI="http://ipset.netfilter.org/${PN}-${MY_PV}.tar.bz2
-		http://ipset.netfilter.org/patch-o-matic-ng-${POM_PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-RDEPEND=">=net-firewall/iptables-1.4"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/ipset-${MY_PV%-*}
-
-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"
-	myconf="${myconf} KERNEL_DIR=${WORKDIR}/patch-o-matic-ng/patchlets/set/linux-2.6"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} || die "failed to build"
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${myconf} install || die "failed to package"
-}
-
-pkg_postinst() {
-	elog "To use ${PN} you must have the ip_set kernel module compiled!"
-	elog "To patch you kernel run:"
-	elog
-	elog " # emerge --config ipset"
-	elog
-	elog "And follow on-screen instructions"
-}
-
-pkg_config() {
-	cd "${ROOT}${PORTAGE_TMPDIR}"
-	[ -d patch-o-matic-ng ] && {
-		einfo "${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory exist. Cleaning it..." ;
-		rm -rf patch-o-matic-ng;
-	}
-	mkdir patch-o-matic-ng && cd patch-o-matic-ng
-
-	IPTVERINS=`echo $(best_version net-firewall/iptables) | \
-	sed -n 's:^[^/]*/[[:alpha:]]*-\([0-9]\+\([.][0-9]\+\)*[a-z]\?\(_\(pre\|p\|beta\|alpha\|rc\)[0-9]*\)*\)\(-r[0-9]\+\)\?$:\1:p'`
-
-	einfo "Unpacking patch-o-matic-ng-${POM_PV} and iptables-${IPTVERINS} sources"
-	unpack {patch-o-matic-ng-${POM_PV},iptables-${IPTVERINS}}.tar.bz2
-
-	einfo "I'm going to patch sources in ${ROOT}usr/src/linux"
-	cd patch-o-matic-ng
-	KERNEL_DIR="${ROOT}"usr/src/linux IPTABLES_DIR=../iptables-${IPTVERINS} ./runme set
-
-	einfo "Cleaning ${ROOT}${PORTAGE_TMPDIR}/patch-o-matic-ng directory"
-	rm -rf "${ROOT}${PORTAGE_TMPDIR}"/patch-o-matic-ng
-}
diff --git a/net-firewall/ipset/ipset-2.3.3a.ebuild b/net-firewall/ipset/ipset-2.3.3a.ebuild
deleted file mode 100644
index fb544835c4ce..000000000000
--- a/net-firewall/ipset/ipset-2.3.3a.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.2 2008/10/14 07:21:01 robbat2 Exp $
-
-inherit eutils versionator toolchain-funcs linux-mod linux-info
-
-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() {
-	get_version
-
-	modules=0
-	msg=''
-	if linux_chkconfig_builtin "MODULES" ; then
-		modules=1
-		msg="Modular kernel detected, will build kernel modules"
-	else
-		msg="Nonmodular kernel detected, will not build kernel modules"
-	fi
-	einfo "${msg}"
-
-	[[ $modules -eq 1 ]] && \
-		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 [[ $modules -eq 1 ]]; 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 [[ $modules -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		cd "${S}/kernel"
-		export KERNELDIR="${KERNEL_DIR}"
-		linux-mod_src_install
-	fi
-}
diff --git a/net-firewall/ipset/ipset-2.4.2.ebuild b/net-firewall/ipset/ipset-2.4.2.ebuild
deleted file mode 100644
index 8a39f360ac4b..000000000000
--- a/net-firewall/ipset/ipset-2.4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.4.2.ebuild,v 1.1 2008/10/24 21:28:25 robbat2 Exp $
-
-inherit eutils versionator toolchain-funcs linux-mod linux-info
-
-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
-
-	epatch "${FILESDIR}"/ipset-2.4.2-glibc28-fix.patch
-}
-
-pkg_setup() {
-	get_version
-
-	modules=0
-	msg=''
-	if linux_chkconfig_builtin "MODULES" ; then
-		modules=1
-		msg="Modular kernel detected, will build kernel modules"
-	else
-		msg="Nonmodular kernel detected, will not build kernel modules"
-	fi
-	einfo "${msg}"
-
-	[[ $modules -eq 1 ]] && \
-		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 [[ $modules -eq 1 ]]; 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 [[ $modules -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		cd "${S}/kernel"
-		export KERNELDIR="${KERNEL_DIR}"
-		linux-mod_src_install
-	fi
-}
diff --git a/net-firewall/ipset/ipset-2.4.9.ebuild b/net-firewall/ipset/ipset-2.4.9-r1.ebuild
index e1622181017a..b4a8ca810635 100644
--- a/net-firewall/ipset/ipset-2.4.9.ebuild
+++ b/net-firewall/ipset/ipset-2.4.9-r1.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.9.ebuild,v 1.1 2009/02/28 14:07:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.9-r1.ebuild,v 1.1 2009/03/03 13:15:52 pva Exp $
 
 inherit eutils versionator toolchain-funcs linux-mod linux-info
 
@@ -42,6 +42,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.4.7-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-2.4.9-gethostbyname-align.patch"
 }
 
 pkg_setup() {