Version bump, drop old.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 29 insertions, 154 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index da458d9b8a41..14bef4f22bff 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2009/11/15 17:34:19 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.34 2010/02/08 18:39:26 pva Exp $
+
+*ipset-4.2 (08 Feb 2010)
+
+  08 Feb 2010; Peter Volkov <pva@gentoo.org> -ipset-2.2.9.20070401.ebuild,
+  -files/ipset-2.4.2-glibc28-fix.patch,
+  -files/ipset-2.4.9-gethostbyname-align.patch, -ipset-3.0.ebuild,
+  +ipset-4.2.ebuild:
+  Version bump, drop old.
 
   15 Nov 2009; Peter Volkov <pva@gentoo.org> ipset-4.1.ebuild:
   USE='modules' support.
diff --git a/net-firewall/ipset/files/ipset-2.4.2-glibc28-fix.patch b/net-firewall/ipset/files/ipset-2.4.2-glibc28-fix.patch
deleted file mode 100644
index c69865f6e9ad..000000000000
--- a/net-firewall/ipset/files/ipset-2.4.2-glibc28-fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_iphash.c ipset-2.4.2/ipset_iphash.c
---- ipset-2.4.2.orig/ipset_iphash.c	2008-10-23 09:03:47.000000000 -0700
-+++ ipset-2.4.2/ipset_iphash.c	2008-10-24 14:24:53.665544125 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_iphash.h>
- 
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_ipporthash.c ipset-2.4.2/ipset_ipporthash.c
---- ipset-2.4.2.orig/ipset_ipporthash.c	2008-10-23 09:05:01.000000000 -0700
-+++ ipset-2.4.2/ipset_ipporthash.c	2008-10-24 14:24:48.755124578 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_ipporthash.h>
- 
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_ipportiphash.c ipset-2.4.2/ipset_ipportiphash.c
---- ipset-2.4.2.orig/ipset_ipportiphash.c	2008-10-23 09:06:22.000000000 -0700
-+++ ipset-2.4.2/ipset_ipportiphash.c	2008-10-24 14:24:36.931696323 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_ipportiphash.h>
- 
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_ipportnethash.c ipset-2.4.2/ipset_ipportnethash.c
---- ipset-2.4.2.orig/ipset_ipportnethash.c	2008-10-23 09:06:31.000000000 -0700
-+++ ipset-2.4.2/ipset_ipportnethash.c	2008-10-24 14:24:34.225051888 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_ipportnethash.h>
- 
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_iptree.c ipset-2.4.2/ipset_iptree.c
---- ipset-2.4.2.orig/ipset_iptree.c	2008-10-21 14:57:53.000000000 -0700
-+++ ipset-2.4.2/ipset_iptree.c	2008-10-24 14:24:46.035116608 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_iptree.h>
- #include "ipset.h"
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_iptreemap.c ipset-2.4.2/ipset_iptreemap.c
---- ipset-2.4.2.orig/ipset_iptreemap.c	2008-10-21 14:58:23.000000000 -0700
-+++ ipset-2.4.2/ipset_iptreemap.c	2008-10-24 14:24:40.226279494 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_iptreemap.h>
- 
-diff -Nuar --exclude '*~' ipset-2.4.2.orig/ipset_nethash.c ipset-2.4.2/ipset_nethash.c
---- ipset-2.4.2.orig/ipset_nethash.c	2008-10-23 09:04:32.000000000 -0700
-+++ ipset-2.4.2/ipset_nethash.c	2008-10-24 14:24:42.722945849 -0700
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #include <linux/netfilter_ipv4/ip_set_nethash.h>
- 
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
deleted file mode 100644
index cbc2c39f7750..000000000000
--- a/net-firewall/ipset/files/ipset-2.4.9-gethostbyname-align.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.2.9.20070401.ebuild b/net-firewall/ipset/ipset-2.2.9.20070401.ebuild
deleted file mode 100644
index 3c8346d417fe..000000000000
--- a/net-firewall/ipset/ipset-2.2.9.20070401.ebuild
+++ /dev/null
@@ -1,45 +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.2.9.20070401.ebuild,v 1.4 2007/11/10 13:42:39 opfer Exp $
-
-inherit eutils
-
-MY_PV="${PV/2.2.9.}"
-MY_P="${PN}-${MY_PV}"
-MY_P_POM="patch-o-matic-ng-${MY_PV}"
-DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
-HOMEPAGE="http://ipset.netfilter.org/"
-SRC_URI="http://ftp.netfilter.org/pub/ipset/snapshot/${MY_P}.tar.bz2
-	http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/${MY_P_POM}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-RDEPEND=">=net-firewall/iptables-1.3"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/lib"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	myconf="${myconf} KERNEL_DIR=${WORKDIR}/${MY_P_POM}/patchlets/set/linux-2.6"
-	export myconf
-}
-
-src_compile() {
-	src_defs
-	emake COPT_FLAGS="${CFLAGS}" ${myconf} || die "failed to build"
-}
-
-src_install() {
-	src_defs
-	emake DESTDIR="${D}" ${myconf} install || die "failed to package"
-}
-
-pkg_postinst() {
-	elog "To use ${PF} you must have the ip_set kernel module compiled!"
-}
diff --git a/net-firewall/ipset/ipset-3.0.ebuild b/net-firewall/ipset/ipset-4.2.ebuild
index 1730d0bbf2a0..c82a5d3814a0 100644
--- a/net-firewall/ipset/ipset-3.0.ebuild
+++ b/net-firewall/ipset/ipset-4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-3.0.ebuild,v 1.3 2009/09/06 21:15:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.2.ebuild,v 1.1 2010/02/08 18:39:26 pva Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="modules"
 
 RDEPEND=">=net-firewall/iptables-1.4.4"
 DEPEND="${RDEPEND}"
@@ -32,23 +32,26 @@ for i in ip_set{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}
 done
 # sanity
 CONFIG_CHECK="NETFILTER"
-ERROR_CFG="ipset needs netfilter support in your kernel."
+ERROR_CFG="ipset requires netfilter support in your kernel."
 
 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"
+	build_modules=0
+	if use modules; then
+		if linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_builtin "IP_NF_SET"; then #274577
+				einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules"
+			else
+				build_modules=1
+				einfo "Modular kernel detected, will build kernel modules"
+			fi
+		else
+			einfo "Nonmodular kernel detected, will not build kernel modules"
+		fi
 	fi
-	einfo "${msg}"
 
-	[[ $modules -eq 1 ]] && \
-		linux-mod_pkg_setup
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
 	myconf="${myconf} PREFIX="
 	myconf="${myconf} LIBDIR=/$(get_libdir)"
 	myconf="${myconf} BINDIR=/sbin"
@@ -72,7 +75,7 @@ src_compile() {
 	einfo "Building userspace"
 	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"
 
-	if [[ $modules -eq 1 ]]; then
+	if [[ ${build_modules} -eq 1 ]]; then
 		einfo "Building kernel modules"
 		cd "${S}/kernel"
 		export KERNELDIR="${KERNEL_DIR}"
@@ -84,7 +87,7 @@ src_install() {
 	einfo "Installing userspace"
 	emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
 
-	if [[ $modules -eq 1 ]]; then
+	if [[ ${build_modules} -eq 1 ]]; then
 		einfo "Installing kernel modules"
 		cd "${S}/kernel"
 		export KERNELDIR="${KERNEL_DIR}"