Bump per bug #509804.

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

3 files changed, 124 insertions, 3 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 05d58b1a050d..be97e26df465 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipset
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.74 2013/12/01 19:16:16 robbat2 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.75 2014/06/20 20:57:10 robbat2 Exp $
+
+*ipset-6.21.1 (20 Jun 2014)
+
+  20 Jun 2014; Robin H. Johnson <robbat2@gentoo.org> +ipset-6.21.1.ebuild:
+  Bump per bug #509804.
 
 *ipset-6.20.1 (01 Dec 2013)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 255142b58d05..2fc760b6234b 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -7,11 +7,13 @@ DIST ipset-6.16.tar.bz2 433118 SHA256 bc3ea05cfbacd43aebff6668825453d0a626edd5d3
 DIST ipset-6.17.tar.bz2 448076 SHA256 7987bb8de1b0490b32084ab72165ae53038e497a96ab9940920280d8068629b0 SHA512 668f173b7ddd8a18af2730205e2e2c38610aa9fd191af52f91080e903bcd8e1f38e8e3a7fd57077decb00fd0556df89c3315c91eaffaa6977f2caf2a3300b175 WHIRLPOOL 1d08c841d87c7a5ca355857ac823ee696922b867690e9066c631414615c98f3cf3e59c6dd8d9f556170eef90a029260c7d41dc1e3f47811ede2190c5d0298e8b
 DIST ipset-6.19.tar.bz2 465927 SHA256 058e7950efdf8b9539ab79eb145de7be60d6cb7b92c0c011edda37e70135024c SHA512 9e9fdccd8ae34ad56c5fc6da03060b39b3acc9a53154acf7e82df3f2c1545b2bdcc7b5b9b4f6ddd6ee3e8582e81b1fa51fae37cb4f46948c053d5153bdca6f39 WHIRLPOOL 31472a732781598c8d99ee562766492c225e359b8153ff68a7769d8fa86f41cac9749eda08e4e3922a6ada5a815192109104b42c59ba3079530f6c0b0169613c
 DIST ipset-6.20.1.tar.bz2 500898 SHA256 356cac020438cd0871acbfc4cb119b8296030f0bb4661ad0d44bbc115ccbce92 SHA512 3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565 WHIRLPOOL f31cd533d286238e63f38aecbf281d428d75e856b393f61db5f6622d0dc0cd0a6de7aa4d3eaa2831e1da7dd0846e95c22f92b3a586cf3918cee074360a4caff3
+DIST ipset-6.21.1.tar.bz2 510013 SHA256 cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb WHIRLPOOL 230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b
 EBUILD ipset-6.15.ebuild 3340 SHA256 0a84e355c2e9a87e4e321c6db6f88680d546939fafaa9049b81304c2cf73ea2d SHA512 41cf7a912d6359384aaa8444d6cd5696df16a1babfe3c2d26bdd96d328e8a0e0f9a8ea88df84f126b11fb91dcfc084fd6417093f3160402d9e0d190ec0d5826a WHIRLPOOL ddd0fa4b2fb0a689ea6ae5cf209290196fb6a77a33fea169ef59c032895037e82e6b913a49fdec09575d2fc0837adea7b0edc702d05132a714717c91e44b6ca9
 EBUILD ipset-6.16.1.ebuild 3317 SHA256 21ed030cf52286c01d606275ec6cbe540e7494ee9aaffadefec9940647ebe69d SHA512 72cee79bb4347bd10db533763ab9145c56397ca134eca02de934f907565a520558f3d13ba3f50e429c059c3dcacb56d6adcce09e37da7d3f27c8ced5f1f15113 WHIRLPOOL b1caa8d5b01055e051f79445f7561d7335022dac561c4186baa717d0ec3b1d45a1ad5b3689290845068eaad9965966afc69f7bae55ecf2de80714ee1223fa80d
 EBUILD ipset-6.16.ebuild 3315 SHA256 176714fc62f02a89a724915945683a49f7f85ed0b062aa7f45f6c450d39e137f SHA512 fb411c9c8ee4b42fd38fea98d6a8f2bfcf360ad4150d44442c5cedf2e77ecf24ad951b89b6eb2a24d8f8465a4df77d96c666b99e74f92877aca187af4052f4af WHIRLPOOL 263fe190d2c4a1ab4f513ffef96ad9542be68ca52a86068e8b1f0b38223d3ad9a5a144de8ac662cb7f0f42f542de6b7c30fbf8690b537203e70f18678e4053c0
 EBUILD ipset-6.17.ebuild 3308 SHA256 72a88d8eb30040bc94230e62434182b0ff2393182851877e0f50cfe359208d8b SHA512 aeb04ed0be26c4b8b3aab67a3731dbddf9cc915d8fe295b7ed31a8e287f077b8623c623edb812471a597b0d6c993ce370f2043a1d063fae37c1f9c5e0d738958 WHIRLPOOL f4697fbdd268ef3b5fbbedd99f5e7527ed4e93ae001c57aa5f15a1f2c7ed2fdb3eeaf813009cfafbc7e919176a3ab1ff11405d6a6314210df8362c374eb131d0
 EBUILD ipset-6.19.ebuild 3314 SHA256 caccb43b2726ded7f4c8f2a0196828ab13e943790ea88d744b3834c895078ab3 SHA512 ab365c15f87915083178120ee26656dd0282884c2d3e0f2e8f10e74e9c06061894680d64de0f06786f14bfb983140ea3fbdaee12d010f920863a9c74cc1d6638 WHIRLPOOL 176f53eecfd7295eae3983b3c197c01f4756ff324d34b393e0a92c83fc89e9475595c85f1ae55d133e8b71adcef554ce9c52f04ab73adc179c80797da94c888a
 EBUILD ipset-6.20.1.ebuild 3531 SHA256 886fc3f072b7813979e4d573a97798b1089fd90cb76d6dfc0bdcfb1d06af94e5 SHA512 4dbc9334ad24da7849a5509800deb9baae2c87cbf68fed19aca164d4d19d2689f80fb1621ce0e2f7202f5c0624450d592c606f3bc7b4db9218169a2c59b45c45 WHIRLPOOL 2124ee2d3014f0766bfac54e2d453060e528a7cd934030048f24c2e5c9a3245803d079f65e37317f1c2cbb055d41124fffd100b31ba839e433ec2323c9fbf528
-MISC ChangeLog 12927 SHA256 8527a8fbca50b91b67556954e166f3a20337066a57963c99dd56eadc637a3187 SHA512 499372206df3113998cb76a47b0937708b1fc0f4063f55fd138086215fa6b88cfbc8f6521ebb9ad12edc654911f6c96ee50f931107613a4263e76a57107f40a8 WHIRLPOOL 1ac1527b8eb715539c1689c959a6a64a8a553764a4c3de8a49e75ce51a8992ee7c6703adf5de5b9a256b1658583ecc009de48a29e8876558dd4c0ef3961369c6
+EBUILD ipset-6.21.1.ebuild 3531 SHA256 e439eb1199c00650f9042e961f302a10f09143e2bc5c1769d147db9521ebed2d SHA512 428d85f4c9f9522d6d65fc25dbb805eae4db507123f236377ec62fa4eb8b65c01bafdf8dbaa17bd94062265c3bc7b37fb3e9f74f82d232701a75cf413125d514 WHIRLPOOL d1c2473a5b3b1c9bf09ddc569fdaef90b76a75126ac2ee10dd295b52bc2d076d719f505e53a0326c9a980c2506dcf13b41584554828d0800165374a8d6cdb391
+MISC ChangeLog 13056 SHA256 a8c9789432b62e6965e181dd666fbae132143b5e80e8d989b36bdd68cfc4e4d7 SHA512 3a7878735fa6614eb5a18fa483c3fdaf60fa383834fe4dbf036b8edbce8a625703bd09cd89ae1d6987e0cc25a6ddf22e62628fd709ba9986190e26e39d03f095 WHIRLPOOL be868a0064b1e59c37ccfcfe89199b405ed7d080465c3b27156981d00c775dccdc8ce78a471b7f28f4fcf2bbe26a26b6c3f33607a4b6b4ad35de0aad66c74f0d
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
diff --git a/net-firewall/ipset/ipset-6.21.1.ebuild b/net-firewall/ipset/ipset-6.21.1.ebuild
new file mode 100644
index 000000000000..fd3a04501b56
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.21.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild,v 1.1 2014/06/20 20:57:10 robbat2 Exp $
+
+EAPI="5"
+MODULES_OPTIONAL_USE=modules
+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 ~ppc ~x86"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+	net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# 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{,port{,net},iface,net}},_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."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) 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/<your_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 \
+		$(use_with modules kmod) \
+		--disable-static \
+		--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"
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/ipset.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd ${PN}
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod_src_install
+	fi
+}