Version bump.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

3 files changed, 120 insertions, 13 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 169eb877bca4..efd6842bca8c 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.57 2011/12/17 03:30:59 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.58 2012/02/21 09:02:06 robbat2 Exp $
+
+*ipset-6.11 (21 Feb 2012)
+
+  21 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +ipset-6.11.ebuild:
+  Version bump.
 
 *ipset-6.10 (17 Dec 2011)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 0bd076a4ad81..4dcb7928272e 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ipset.confd 191 RMD160 b05d15226960cfaad609a11433bd5ec47c855681 SHA1 57ca914734177c0247802749896ff5cee2806f4e SHA256 51f976f3c4aedd5cae6c48c62e566527de344cef8eaf8175ce1e631b7b670043
 AUX ipset.initd 1213 RMD160 8633508d05ba592326c2962f1366704c91fd4a3f SHA1 964b5b58461f0f56bc29cc400fb465769ceba115 SHA256 bbc09cd718ad49b2df1a23faeda97d7337e8fd1ebbfdde4286f1d7d6c079528d
 AUX ipset.initd-r1 1219 RMD160 7a9d5c079dd16f48c88e09a682f96fbd5e03476b SHA1 88a808984496ae8e22bb34a3105f965e7bd6dfb8 SHA256 ca7141461964f4e1ab6fd8ca22c2abcf6629b8a635eae9f9fd2e9771716f2f28
 AUX ipset.initd-r2 1467 RMD160 27bb49097821030d66be33b0d7073f1282dfb6f0 SHA1 ed99ee71e1ba9795c84602e1748109d195490f3c SHA256 6cd6a7d414b234c4db7ceb4d76fc4ef99239fd552822177545dae0d6b413bd51
 DIST ipset-4.5.tar.bz2 72428 RMD160 eb986eee5daa5f49be5df0eeb7f09c595b415ee1 SHA1 696a5cd96459c8fb028f0dfb9927a5c4f183d28b SHA256 f94200f39398f90b60633b5fa45f0c327d5915e2c5a68e6c90fcb8ea13be6994
 DIST ipset-6.10.tar.bz2 123721 RMD160 250f952e94fc687e2b8d7a6b93831e08ac17a06d SHA1 bc8c1195590c0c08308ff7a5e762b698c04413ce SHA256 a2f7e9615d83f60ac915793adf71a29724166152068b19a7a2ff4900b51868e1
+DIST ipset-6.11.tar.bz2 382101 RMD160 a9b2cd9d4ec09f70dfe44436ed6a28b7a7674a32 SHA1 6b796f662ae41f2fba254bfff09281d661139881 SHA256 828f6f216037b528a63081c21ee32d585cf6e34ab7d506b46704ac243313dfb6
 DIST ipset-6.8.tar.bz2 122954 RMD160 94ee3177540743153013b04e560839596dde1aad SHA1 0f4abb79fe8a65088f687e8a274aaddb542bc86a SHA256 d7b499ee961cd92ba5f0f698e5de49909d8b2c6697ff5aea3a1535e183f9b809
 DIST ipset-6.9.1.tar.bz2 123268 RMD160 068e5e37e761374089e53815b0ddca9ffd1894bb SHA1 781d5ad6a9e4d5bf6f8ccad3dfee8a578ed06c2a SHA256 db099044022f767046ec89c77de01ad6f0faf7f50f8f42b886c3c71ac5994abe
 EBUILD ipset-4.5.ebuild 2840 RMD160 bae015ed7f806cee6c6c8cb411815afff8bdfae4 SHA1 94cd6b8724e0f403f5d9969cd2de4a5ac2ab1abf SHA256 96e2d91d9a1f27abe2e44f380705536e4894fd27e4c9a684ebd4540d24da0ca0
 EBUILD ipset-6.10.ebuild 3433 RMD160 12ab1e7e9072e196cb3b27412a2ab5234c211fe5 SHA1 d4c665bd5ea0f9aa244f552e44d9285c6311d3c2 SHA256 3b98a3a484768da20b3659d1255e43a4257c8851eab60fe09999ebf0d3aad92d
+EBUILD ipset-6.11.ebuild 3437 RMD160 8120f19af0725e45823dd073745fdb69039068dd SHA1 07a68125e7b565bcad6f62a9fcd534c22447ba45 SHA256 6b54c30b3076d419314c8a72cd9d4b02dcff659a6d40ae75176e09d06ffc98ec
 EBUILD ipset-6.8.ebuild 3250 RMD160 6e9ffa7ff745b7a0ae2053222f449d1553cb5f32 SHA1 e8efe33efc46bec20d20cf33b34e9aa124ae0660 SHA256 adc276a151d484a522464376d127cd4437acdef5bd7a871fcea79c65fa7a1c9c
 EBUILD ipset-6.9.1-r1.ebuild 3391 RMD160 be1e553f741c5760279ecd7ab4b6d0f581c8c798 SHA1 1a82ea52d786103142f3e88b73ee55e09ffea9d0 SHA256 1ccf3ae26d73600ebc5e7fe316eb6d3b049887cc64bac078226c0b1e3fe22eac
 EBUILD ipset-6.9.1-r2.ebuild 3397 RMD160 3f19c1bb4a84c0358a275bfdc1b1e3c61e2e31ef SHA1 402ba2f4ccd2ad621fca2fb5c619779b53ae2483 SHA256 349e0b63af1730d016d2963a0e10519d104a33828df1d3079d345462f355427f
 EBUILD ipset-6.9.1.ebuild 3249 RMD160 4a32a1a7ceb39a8a986d4e1f0217799522185ee0 SHA1 e63a469a55f3b60191822e09d21b4def1e16b7c9 SHA256 990e629564a4849fb8aafb3344d11132298d3bb20b0653ff28b2b145dec750c5
-MISC ChangeLog 10380 RMD160 ca511a00580242d02c06a07640939883374f5782 SHA1 8282100f24dbcf611645c85e2e49e9a9fe4b1645 SHA256 e9bd87c12fd1ef3a9c63434dd1245e063892a4c5517065dfcdeb25c3dfece2b4
+MISC ChangeLog 10501 RMD160 1abbce9175acf09fa0c619912363f8298bf592d4 SHA1 a7e7bf92afcd7a3a223e7fcac9bda621ff00119d SHA256 9f5368f43c495991a0e29f7d420bf89409e6f3f2dec81827b02e9be4bb806afe
 MISC metadata.xml 261 RMD160 011c351b20b4b062f3d8018435a1b0b8eb1693ce SHA1 4d43ddf52da446a21a2565ebd52272d19dfaa767 SHA256 66f8679fb88591451a2fb75caa068efe24aa933bdf312ed6337eb74f933ac9a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk7sDPAACgkQGrk+8vGYmwdOvQD5AYL3Zv/GZSZyIq06VTZvW7IE
-4mKTniQRiDpVXdyhp4YA+QFhXTBiaAWhntY8fHm9KQ9TGYY9O87A8xZje6LpI4Ph
-=+lSy
------END PGP SIGNATURE-----
diff --git a/net-firewall/ipset/ipset-6.11.ebuild b/net-firewall/ipset/ipset-6.11.ebuild
new file mode 100644
index 000000000000..046f515860e5
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.11.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.11.ebuild,v 1.1 2012/02/21 09:02:06 robbat2 Exp $
+
+EAPI="4"
+inherit autotools linux-info linux-mod
+
+# Maintainer: with version bump take a look on:
+# http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ipset.git;a=commit;h=70fdf030545f00888bcebb5fca8243a6dccca95b
+
+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
+
+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 should recompile and run new kernel to avoid runtime errors."
+		die "Unpatched kernel"
+	fi
+}
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+
+	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_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<you_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "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
+
+	newinitd ${FILESDIR}/ipset.initd-r2 ${PN}
+	newconfd ${FILESDIR}/ipset.confd ${PN}
+	keepdir /var/lib/ipset
+	find "${ED}" \( -name '*.la' -o -name '*.a' \) -exec rm -f '{}' +
+}