Version bump, thank Ed Wildgoose for report.

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

3 files changed, 118 insertions, 12 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index fb81ea154394..09f0d4957713 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,11 @@
 # 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.48 2011/07/02 13:04:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.49 2011/07/24 10:59:11 pva Exp $
+
+*ipset-6.8 (24 Jul 2011)
+
+  24 Jul 2011; Peter Volkov <pva@gentoo.org> +ipset-6.8.ebuild:
+  Version bump, thank Ed Wildgoose for report.
 
   02 Jul 2011; Sven Wegener <swegener@gentoo.org> ipset-6.7-r1.ebuild:
   Use correct source and build options for kernel.
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 625cce4e9748..76bdb8e08d29 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6a SHA1 213693f41ba7504b4485669b4f12cfa35f4380ba SHA256 3c64df05ecfcc361e92389e9c4e9a857be5b8097855311a7c3c7f6cf731f458a
 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
 DIST ipset-6.7.tar.bz2 121850 RMD160 3a55f03e6d3a81cd6a721cb8c8c4e4ff08aeac0c SHA1 968bc0e9f1bd248333a4483e5cb2c57cd1788454 SHA256 2422f35020d943729832e74cc1f4d88074f1b8d6f1430d4d492d6f7493cf3f24
+DIST ipset-6.8.tar.bz2 122954 RMD160 94ee3177540743153013b04e560839596dde1aad SHA1 0f4abb79fe8a65088f687e8a274aaddb542bc86a SHA256 d7b499ee961cd92ba5f0f698e5de49909d8b2c6697ff5aea3a1535e183f9b809
 EBUILD ipset-4.4.ebuild 2842 RMD160 f5ffe005565e60e51e8f5560ca9cf57284ff9b4f SHA1 e878ddbf78b3d15d45a23e0ea21ba9ac3c4e4ad3 SHA256 7d7df9f7ca95b31107e88bb35a3b31fa12857e2ed8552371e2f5fcd5457819a6
 EBUILD ipset-4.5.ebuild 2844 RMD160 f9f96b96636e0f879c8f6450cf44d3e7d52f8d3c SHA1 f6975cc4e5d9f7c16337973d6c3cda006abe7464 SHA256 68d4d644b7415149ab861fb063ac5918fc7e32eca743a312f07da7d52457590b
 EBUILD ipset-6.7-r1.ebuild 3006 RMD160 851a5f73daec32601024320b2705e1bc66743d6b SHA1 22ec5612ac7f4f6f9fddd4e0a4e3593100f1a6ab SHA256 0b25ee458be99655bc2004af8f73f96bcd6d2f6d25d1e8dd3b32e9805fbb6144
-MISC ChangeLog 8643 RMD160 d0bf7a841c432a6473f82037111c738d434710ca SHA1 6249b564882b200ffd4e97610629cefbed6f2ceb SHA256 c8ed5bf06c31ecea2666127899f2d593257661544a3678023e44d5440bbf0bcf
+EBUILD ipset-6.8.ebuild 3247 RMD160 33d32aa5a0f980a8f9e35a946e04f5f7e450c9ce SHA1 38bd9e9b3292230b13480336c6c53fca794bae8c SHA256 c86d17773332e0be85e562f250d209a5332663eb5fe25b34346422fb34eaa1dc
+MISC ChangeLog 8776 RMD160 3ed2eed75b591999fcadd827c13a561a46f5485f SHA1 adcf7562f7cf18ffac4cf40ee4f2485153b88c87 SHA256 f4c47fae8f9895b935a87c66c1d2f8b46419a38aa5a61657216886b8687f27c4
 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4PF1gACgkQI1lqEGTUzyTh3gCdG14zve5Nc4g6VcriA1KeU/pG
-daUAoM5GpatYKdHak8leMWaN21xEUqcr
-=LOkI
------END PGP SIGNATURE-----
diff --git a/net-firewall/ipset/ipset-6.8.ebuild b/net-firewall/ipset/ipset-6.8.ebuild
new file mode 100644
index 000000000000..c2204b2969a5
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.8.ebuild
@@ -0,0 +1,109 @@
+# 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.8.ebuild,v 1.1 2011/07/24 10:59:11 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="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
+	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES !IP_SET"
+ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+ERROR_IP6_NF_IPTABLES="ipset requires IP6_NF_IPTABLES support in your kernel."
+ERROR_IP_SET="There is IP_SET support in your kernel. Please build ipset with modules USE flag disabled or you may have troubles loading correct modules."
+
+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 35 && die "${PN} requires kernel greater then 2.6.35."
+		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) \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+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' -o -name '*.a' \) -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Note you need to rebuid and run kernel with netlink.patch or you'll get error:"
+	elog "Kernel error received: Invalid argument"
+}