Version bump, bug 356727, thank Andreis_Vinogradovs (slepnoga) for report.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 112 insertions, 110 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 2fc234217277..362ba2818aff 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.42 2011/03/25 20:19:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.43 2011/05/01 12:57:28 pva Exp $
+
+*ipset-6.4 (01 May 2011)
+
+  01 May 2011; Peter Volkov <pva@gentoo.org> -ipset-2.4.7.ebuild,
+  +ipset-6.4.ebuild:
+  Version bump, bug 356727, thank Andreis_Vinogradovs (slepnoga) for report.
 
   25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> ipset-2.4.7.ebuild,
   ipset-4.4.ebuild, ipset-4.5.ebuild:
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 516e60437ffe..87770f504250 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6a SHA1 213693f41ba7504b4485669b4f12cfa35f4380ba SHA256 3c64df05ecfcc361e92389e9c4e9a857be5b8097855311a7c3c7f6cf731f458a
-DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928
 DIST ipset-4.4.tar.bz2 72636 RMD160 464de587beacab53f2ca6a73f5a081ddd0156d16 SHA1 fb86d8b00ed57e13b3ae8dd876f9b45995cabbf3 SHA256 19bb07a39d6c1e705cc0715e9e3ed07f450bc4869e2534169cfd7be59271bfd9
 DIST ipset-4.5.tar.bz2 72428 RMD160 eb986eee5daa5f49be5df0eeb7f09c595b415ee1 SHA1 696a5cd96459c8fb028f0dfb9927a5c4f183d28b SHA256 f94200f39398f90b60633b5fa45f0c327d5915e2c5a68e6c90fcb8ea13be6994
-EBUILD ipset-2.4.7.ebuild 2597 RMD160 f2fb64f63a8d645e4556cacefd20626cf2d45cce SHA1 f8be4b23bcc313258dc887aa92676ac7344e07a6 SHA256 a2f1afc35fc3e41bb00e4ff942e2ed433ebbb40ad6ce04769dd25fd983e10d83
+DIST ipset-6.4.tar.bz2 117283 RMD160 afd73c31b1b578ea414c22bc80befbafe1d11b13 SHA1 828ce9d37bb4861eb47bbd08decac597b8cdcd2d SHA256 25729b75ed28d57b6dfc56c62fadd9919113cffae9af04a93a2688f6b164ba8d
 EBUILD ipset-4.4.ebuild 2842 RMD160 f5ffe005565e60e51e8f5560ca9cf57284ff9b4f SHA1 e878ddbf78b3d15d45a23e0ea21ba9ac3c4e4ad3 SHA256 7d7df9f7ca95b31107e88bb35a3b31fa12857e2ed8552371e2f5fcd5457819a6
 EBUILD ipset-4.5.ebuild 2844 RMD160 f9f96b96636e0f879c8f6450cf44d3e7d52f8d3c SHA1 f6975cc4e5d9f7c16337973d6c3cda006abe7464 SHA256 68d4d644b7415149ab861fb063ac5918fc7e32eca743a312f07da7d52457590b
-MISC ChangeLog 7701 RMD160 758d9cda655bf381b7bb72e4fa1b7395326829f2 SHA1 2b1499d28e87d355c1e08853dfccf07d4d6a482e SHA256 fd2ce468bd23ca0293e7448d4d345b57188ac0fe60a95a0d4e802bbbbc283b81
+EBUILD ipset-6.4.ebuild 2683 RMD160 2cca2fd4c71f4df1cf6b9aac05295fdb3b383e63 SHA1 ae8ded0da7327d5c1d29e715aff2661110b6ed94 SHA256 2ae380a07528275222af80361304eda4455d9dfff1b4853af3fe2f6c5089e0f3
+MISC ChangeLog 7885 RMD160 bbd1bd3ef6972a69c0d035f6da2b4831d3f62a5c SHA1 86e35f56fa89087b97a1383437565e94ac24a219 SHA256 7187f3c48c4c77542e6e22e6c6bcf875793059e55c58f57c169b8066eb056996
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk2M+MUACgkQIiMqcbOVdxQkFAP/Vfc/pxBbzHwN+UoNuDZbq/MN
-fPFKPFIqewVNgYMwhojaFH1zdq3XPYqu9SQGr8WrNqiHGhDdf8bDZU1Xo5kt8F11
-kAMhrJ7KG1wIi4epXIPjqcyTYkY54ATwATuO2oJUnA3zubH6BNpGya5+d4KI5Riu
-DiJs+NO4qLrPKeekAEw=
-=jxn2
------END PGP SIGNATURE-----
diff --git a/net-firewall/ipset/ipset-2.4.7.ebuild b/net-firewall/ipset/ipset-2.4.7.ebuild
deleted file mode 100644
index ebd6435811ef..000000000000
--- a/net-firewall/ipset/ipset-2.4.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild,v 1.6 2011/03/25 20:19:06 xarthisius 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="amd64 x86"
-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}
-	cd "${S}"
-
-	sed -i \
-		-e 's/KERNELDIR/(KERNELDIR)/g' \
-		-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
-		-e '/^all::/iV ?= 0' \
-		-e '/^all::/iKBUILD_OUTPUT ?=' \
-		-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \
-			kernel/Makefile
-
-	sed -i -e 's/^WARN_FLAGS/DONT_WARN_FLAGS/' Makefile
-	epatch "${FILESDIR}/${P}-LDFLAGS.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-6.4.ebuild b/net-firewall/ipset/ipset-6.4.ebuild
new file mode 100644
index 000000000000..960ec50e763c
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.4.ebuild,v 1.1 2011/05/01 12:57:28 pva Exp $
+
+EAPI="4"
+
+inherit autotools linux-info 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="~amd64 ~x86"
+IUSE="modules"
+
+RDEPEND=">=net-firewall/iptables-1.4.4
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+# configurable from outside, e.g. /etc/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES=""
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,netport},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES"
+ERROR_CFG="ipset requires netfilter support in your kernel."
+
+check_header_patch() {
+	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
+		eerror "Sorry, but you have to patch kernel sources with the following patch:"
+		eerror " # cd ${KV_DIR}"
+		eerror " # patch -i ${S}/netlink.patch -p1"
+		eerror "You do not need to recompile your kernel."
+		die "Unpatched kernel"
+	fi
+}
+
+
+pkg_setup() {
+	get_version
+
+	build_modules=0
+	if use modules; then
+		kernel_is -lt 2 6 34 && die "${PN} requires kernel greater then 2.6.34."
+		if linux_config_src_exists && 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
+				if kernel_is -gt 2 6 39; then
+					einfo "This kernel has modules inside, will not build kernel modules"
+				else
+					einfo "Modular kernel detected, will build kernel modules"
+					build_modules=1
+				fi
+			fi
+		else
+			einfo "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+
+	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	[[ ${build_modules} -eq 1 ]] && check_header_patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--libdir=${EPREFIX}/$(get_libdir) \
+		--disable-static
+}
+
+src_compile() {
+	einfo "Building userspace"
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		set_arch_to_kernel
+		emake modules
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	emake DESTDIR=${D} install
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+}