Bump.

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

3 files changed, 120 insertions, 16 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 54aeef72f1c2..fea041b8e6a9 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.71 2013/05/07 11:58:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.72 2013/05/27 00:03:39 robbat2 Exp $
+
+*ipset-6.19 (27 May 2013)
+
+  27 May 2013; Robin H. Johnson <robbat2@gentoo.org> +ipset-6.19.ebuild:
+  Bump.
 
   07 May 2013; Sergey Popov <pinkbyte@gentoo.org> ipset-6.17.ebuild:
   Stable on amd64, wrt bug #461978
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 34079baed281..c44f77a1c8ad 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ipset.confd 191 SHA256 51f976f3c4aedd5cae6c48c62e566527de344cef8eaf8175ce1e631b7b670043 SHA512 522810d15bcb2d0b36313e937eae0a7157a29a0b8e771b67a242aa54c36d35db84e328afe363f51dd20e9e05652e3bcc76f3bbeb495eb9968fd250c071de991e WHIRLPOOL 257b1c809b3451bc9675ab8e960802fc96e098c43e3265ce5d57f22bc56104301034a57b0423c13c94d73ac985197f40e3966a8440d3bb7e797ac6704f66f771
 AUX ipset.initd-r2 1467 SHA256 6cd6a7d414b234c4db7ceb4d76fc4ef99239fd552822177545dae0d6b413bd51 SHA512 164e41f4bf95e344605a207b74638fbf6095e406182d4ccf7954fb8cfdfc15a655a74e33a71c6fe0667ef889a6e2a804aa36ca0f182b6ec5c34af61d4ca1405d WHIRLPOOL 48c278a0e07ec04f8f62d9e96c8d27ebcc1725402a6117daddcf909637cf4a5a73f2d7a02b600c5e77597da7b718c08d19c4aea5cc7c8ebdbfe51273ebe2f90b
 DIST ipset-6.15.tar.bz2 432771 SHA256 6f60a472bc2ef7b1c864be6472de65365c90e264dfadf28da48c2361393d8fd1 SHA512 f72329bb8610717ccdddbfaf7b7774e717a34d71fdb7f9c7eac97e3d1b314915500c88137b6e229411df99c86d2228bef447f26c116bc2cf992cfb60ab1422d3 WHIRLPOOL 868ee3cd722c2d86c273aca8f3ca7695e8ef5d00d30111ef0f2bf972a119211008d8cadec1760b43b4f0efb24690f20a2cf5f0fdbbb0700cf66e5660d363ab2a
 DIST ipset-6.16.1.tar.bz2 433347 SHA256 cb5b02deab8521946fd473b77c40f00452b76fed621f0eee76746c74e89e4c3c SHA512 e54d32932875a9d06acba598280de9e83529f36326cbaaeb05d38b985bc40d276dc46e37eae3d1d4c1afcdd69b3074678512349ebd964b6189ca1c6871efe304 WHIRLPOOL ff2276446c7dbb4005de236b73bf9879ead8273f3ec014883160b779f6c089eaf7d4c4dce06233ef357f0a8b5376754b158eec29187ae5f5f7bb52bfd2d8ae3c
 DIST ipset-6.16.tar.bz2 433118 SHA256 bc3ea05cfbacd43aebff6668825453d0a626edd5d3495a8670103ab895fba464 SHA512 34ef44af76f3609035ae1bdacb7586f2288ee66701ed8a1a5a0632fb23b5f651fe02b070e0f0f1b0ebae6cab02b3f827cc7e67f740cf77f51ba494c25dcc47dd WHIRLPOOL 3b3c2172626530145401bd813c39114f31bf3546ebe0af6e168ed32ade102c158f3bc5f4690ee8bf0540415adc35929da5d8ca8e4e1c2ec83bf631849a24b8a7
 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
 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 3314 SHA256 3e2b9a099dd3c7e4b29439e04c68b71dc5bd4452d3df4b2270bd77ac4376ccdc SHA512 21f963e043ef59261d09108e1d3bc1a7bbdbdf1e6e70e6097f0313aa0bfe2ed659f378a13addfddda6fef8528ad24c0f1d5d5654decd8cc8c6183e0bbb4b2b76 WHIRLPOOL 1ef92746f595b1f81cfdcca96c0590f9fefc3413d1a57e46873abda76676642ac9570b0faee3f67fb28eaf98f5b3719c4ef386c23e0a6216d2c673962126f79b
-MISC ChangeLog 12372 SHA256 72be82c733e2345e34cbdc7e7c052ac5e73372f0c19255b7d4143b5c61e61070 SHA512 866c8beadca9c26a3511fc97e7c551f7e7ea5cd4a0fba13c24ec60a634f7e046f26eb6ab1c5230f61ce7d15e8b143dc1694f3a913c6ed257e7b7740e7ab86ad1 WHIRLPOOL 87508c4b75c57efa3e0f30a15951c8cced38192ec9722b6ff17e5a3ba6777b1d8af098628cb67ebac1172a8167edaabd7d86b6a1f26b0367241e20a10bcb4721
+EBUILD ipset-6.19.ebuild 3314 SHA256 caccb43b2726ded7f4c8f2a0196828ab13e943790ea88d744b3834c895078ab3 SHA512 ab365c15f87915083178120ee26656dd0282884c2d3e0f2e8f10e74e9c06061894680d64de0f06786f14bfb983140ea3fbdaee12d010f920863a9c74cc1d6638 WHIRLPOOL 176f53eecfd7295eae3983b3c197c01f4756ff324d34b393e0a92c83fc89e9475595c85f1ae55d133e8b71adcef554ce9c52f04ab73adc179c80797da94c888a
+MISC ChangeLog 12480 SHA256 fceaad7c0aa3f416a9962a637ca4adb5b6bd1d29a454933e927da06c3220b801 SHA512 49da7ac69584ee17c00970a5e5aa5a02cca99224e54fcafa9dca92c041be5cd94156c2b4b9604f80cdfe2b0d302d4eeb035acec298aaa9cfd1a98614f43269c9 WHIRLPOOL d2aa23b4bef902c568ff11335c5a76d93ac4c5643642126966890a96707e3200956f7a3dead270e54f0d1549348ea97f9cdc92ed91420f2186d73e4c153c5d49
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRiOxiAAoJECo/aRed9267dosIAK/v5+3oyGb2dq6eR/VFeRZT
-18f3PhYS0XJY/44cfotw53cwG3yimXmG3UtTXc/HFNTI5O5H9pxvGv5dCUmWE5TX
-n3wniV/5z55VaMXexVlKXoWVnjzEH1lc/+QJ2JvgKzHx4B2XpyXiQMyC+5BBKHLq
-+pS28mkOPteUduNHTvpmTdBNdy+DFMjt8SLqHMe56Dfn4zUjS+5nO3h1Qp+pruxL
-/mNGsWVfZg3LTldEM6lwONlz9ijoWtp/WocKLAHBjzgxDO3gKcu2d0g5Ya35cErJ
-UxhxdM7Fn7/3XcO2lbmVVXeDm46JUuef0uskeJteC7G2ixGw04pEVeWOQo9xRZw=
-=clvn
------END PGP SIGNATURE-----
diff --git a/net-firewall/ipset/ipset-6.19.ebuild b/net-firewall/ipset/ipset-6.19.ebuild
new file mode 100644
index 000000000000..ddf3d6b20957
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.19.ebuild,v 1.1 2013/05/27 00:03:39 robbat2 Exp $
+
+EAPI="5"
+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"
+IUSE="modules"
+
+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,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/<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-r2 ${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
+}