Another version bump

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

4 files changed, 235 insertions, 2 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index bbf04db971e6..b82df34674cc 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.61 2012/11/27 11:30:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.62 2012/11/27 11:36:44 pinkbyte Exp $
+
+*ipset-6.16 (27 Nov 2012)
+*ipset-6.15 (27 Nov 2012)
+
+  27 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> +ipset-6.15.ebuild,
+  +ipset-6.16.ebuild:
+  Another version bump
 
 *ipset-6.14 (27 Nov 2012)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 8903c3bf8d6c..84a0ad302cef 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -7,6 +7,8 @@ DIST ipset-6.10.tar.bz2 123721 SHA256 a2f7e9615d83f60ac915793adf71a2972416615206
 DIST ipset-6.11.tar.bz2 382101 SHA256 828f6f216037b528a63081c21ee32d585cf6e34ab7d506b46704ac243313dfb6 SHA512 ac210f71c2a7a55fc71e36044b8d35174c4a423c74204ac24f056b684af03dde57a617d1f0f4f8e77336db8d716a4d50b58704038fb34073f8fa1bffa9d44210 WHIRLPOOL 129a5f12ba417b12ee388fada6dcb08e0eb404d4033b6a57c8e8a349685c8aca8051267ffcfcdcc4575555f7fe67b0262d007aed323b696966a4c194a0709409
 DIST ipset-6.13.tar.bz2 430383 SHA256 be0353699cee53b3a1692dbea745d385766a606b0ea750ff8621fc269c4d2a49 SHA512 717ec7c7ef0cac7f2c7174c045cf86954c5e94b440add2a06ebec3fbb886fc9b4b5dc31afa3cda60f94a7d1ad0be1a44c605105508da9501c4221f57e3ce0d07 WHIRLPOOL a0af600f96fdcc5d4209f689d78d8bd2753d3eb4245ce8d2a2cb37a5296cf285b4705aa7c35d0e5d16e7632bf5e6318c17647e5085561d001690da5eb01e20b5
 DIST ipset-6.14.tar.bz2 431736 SHA256 d744016e2550aba61af849519abb791612a6655b7999dbb873fb2c8347af6ee2 SHA512 c355ca59bfc70002a8d9e9fea23c7346cee946801d54532a2752eb5b5ebfa2f15156736cdde7131804938fe5e3c8bbccdc2ef9d602df04c76531a8c67d8e0d3a WHIRLPOOL 411444d6e07ced576021a30c45c188a96bbe1a31aa91a4f65936df8efbc0d2b58847dc06a108567fb1b8425b85febf039f1375919969ab393d26c048420192ca
+DIST ipset-6.15.tar.bz2 432771 SHA256 6f60a472bc2ef7b1c864be6472de65365c90e264dfadf28da48c2361393d8fd1 SHA512 f72329bb8610717ccdddbfaf7b7774e717a34d71fdb7f9c7eac97e3d1b314915500c88137b6e229411df99c86d2228bef447f26c116bc2cf992cfb60ab1422d3 WHIRLPOOL 868ee3cd722c2d86c273aca8f3ca7695e8ef5d00d30111ef0f2bf972a119211008d8cadec1760b43b4f0efb24690f20a2cf5f0fdbbb0700cf66e5660d363ab2a
+DIST ipset-6.16.tar.bz2 433118 SHA256 bc3ea05cfbacd43aebff6668825453d0a626edd5d3495a8670103ab895fba464 SHA512 34ef44af76f3609035ae1bdacb7586f2288ee66701ed8a1a5a0632fb23b5f651fe02b070e0f0f1b0ebae6cab02b3f827cc7e67f740cf77f51ba494c25dcc47dd WHIRLPOOL 3b3c2172626530145401bd813c39114f31bf3546ebe0af6e168ed32ade102c158f3bc5f4690ee8bf0540415adc35929da5d8ca8e4e1c2ec83bf631849a24b8a7
 DIST ipset-6.8.tar.bz2 122954 SHA256 d7b499ee961cd92ba5f0f698e5de49909d8b2c6697ff5aea3a1535e183f9b809 SHA512 428356b1593b0925f6f8ca7d240a29caff24a8416d0f1ff897c4432d557846432879e545a0b5b75ac318eee18386e80cd936229c09153ca9f7a0f09483cbb60d WHIRLPOOL 1e6faa416a7745541e1bae7461cdfa251a5a9141846654a9e036c21d8ce8de5622fd30bc68e1dfe47728570178b59378fb39e8759c6b3bac0c687a01cb3bd165
 DIST ipset-6.9.1.tar.bz2 123268 SHA256 db099044022f767046ec89c77de01ad6f0faf7f50f8f42b886c3c71ac5994abe SHA512 024a071613fd56577a2fd37ea6e2a961c113f3ca816077fd24b1698e4bd78a8cb3897291505ea02a9b6565b110170ba93b321b3e1a6476ce93b8d93abe3bd1ed WHIRLPOOL d036dc2ba2b6d0d4e9a449450af3773bc8f445b13aff202ca1f0c6a1278490ff20cb72f6e979d3b477c9052e99808ebe58a6bbf51e4cdbc9359c69f3c943ea01
 EBUILD ipset-4.5.ebuild 2840 SHA256 96e2d91d9a1f27abe2e44f380705536e4894fd27e4c9a684ebd4540d24da0ca0 SHA512 c26ec745368db1a78ddf974178605cf4f3ece0af168ab12e2170982fc4c5c74ddb3dd8beab3df067281af51bacc29996450eb8ea38c10dddd81b1db8a1ce002e WHIRLPOOL 4dfc1bce357aa34620f6902db54b625a806e0edb772ea45c897894b53de52f75142b5214fe46c474d8a595340b703de135ada2bee4d80a80c419d0cb176965fa
@@ -14,9 +16,11 @@ EBUILD ipset-6.10.ebuild 3433 SHA256 3b98a3a484768da20b3659d1255e43a4257c8851eab
 EBUILD ipset-6.11.ebuild 3438 SHA256 7b120cf6ea2af79fcc878d340f43a3063c3c603fc2cf3dcc2886eeb5d00aca57 SHA512 4d5533a54f808a090b90eb47093cb64a60109dfc2cf5bb21ea96ec3667f3da7b1b59055d0786534e34305d53431d40c4336d944daf8f12268828fd336ac2ac57 WHIRLPOOL b2215e5801599354bfad451e967c486cb1fa1adcad226aa8b2d0f41b516607376a23e4066648be5ddab45e19cdd1664319b0cc6503e09740453acf0dfa03d9e0
 EBUILD ipset-6.13.ebuild 3472 SHA256 43e1ce00c90087f9970726acae7c3fda07bec6f825de58e2750ab57ddf519a91 SHA512 7ffec961fd866254a22cbdae7436888b6cd8d66c55b414fe7e3d5d3ea2e5375c386e3490e4452a25c623b6863f6a30787e71665b170c3ed1bc3be14bec5d3f17 WHIRLPOOL 9cb9f2c53751083d7d2df1c217a4e0ab0e9e6beea1e7ab9490419edb81eb0fd52f992a91b84ed78faf9621e447b31001892eb8271c477a9f0edda192e3618cb6
 EBUILD ipset-6.14.ebuild 3315 SHA256 99b8b8431d0ebf36a37a9b3bbe25ffae9a0538da733778f1e09b36c3bd50fe88 SHA512 551ba830d99cce557c5c727f4028c7bb1f502fabca76460adc7cde1b7c9ad56a30450d548deced248e8d4341746d4cebbf49c5d5d5209aece9279bb6625cd3b8 WHIRLPOOL e6a56733cfefededa432fcccb21a949bf6cb8f5d88f29355900f2772a6c6ba7f401385e5db3ec72304e4b73b058c8154834a68374306576c83fecaeb25dd34f3
+EBUILD ipset-6.15.ebuild 3315 SHA256 4b540aa8fc8e4e2a3b8cb3108006a03d0acb282438893cc01a12743333cdae94 SHA512 44cb97dd65ff3f83e1f82246cd04de9a26cebbe608e532b1ee3ad1ed0b15c820576bb1774e549c1dd321b72372549e2dbf3861e8bac3f7c3ff42f5b98bdce864 WHIRLPOOL add5c3ce21850e84cd6264c76b6ab769ab25b2595d198fbaea47a4eefd8fd37ece83615d883ec7d592a3bf2027a6a67beaa73cf682086813619fdcd145492d89
+EBUILD ipset-6.16.ebuild 3315 SHA256 cf0720bc8966e3bbead26b7713551ce19976a5eecebcbe31f824d4fd9ef10e6a SHA512 4dc04916fc4cebf7010d62fc90f3aa3494db465f6717e876cc5a86311c027f244fdaa2834cc5ef566fe1359c87b8096e1013d4d964428b800e8ada8b39b2c92e WHIRLPOOL 67edfb4994610ca9450799680bfdc4e8d2f93a61bcdfcbd420cd0bd118043f138e759c4cbc38cd543c40f18a8619db657ecf793dab20b9502ead9a01a8b98ed0
 EBUILD ipset-6.8.ebuild 3250 SHA256 adc276a151d484a522464376d127cd4437acdef5bd7a871fcea79c65fa7a1c9c SHA512 e54e1bf397429d717fa970e60404db922f22af8f65f138184f44e440ded6f9dbc63fa5e4c0c610e27eba013fcc20a5e66c3ba4da62403e16d1947f7b30f5d02f WHIRLPOOL 71aab8a35a0441a2212ace54be132e53fdc5bbc52d00e976473febc1ac414207b776ae596b853c19575274811e32d6dfd6c6f3397bfe54f1eed07cd84d679bf4
 EBUILD ipset-6.9.1-r1.ebuild 3391 SHA256 1ccf3ae26d73600ebc5e7fe316eb6d3b049887cc64bac078226c0b1e3fe22eac SHA512 c90171ed02eda480867e4343add6c294aee2782bf76a175aa2435c0c42415c420ff814ef57bea2b608c7061b3e9951d93f7ca29d5f4d048557d4eb2e66c97a6e WHIRLPOOL d3147869e4651298039e3de1b05840bcdaddcc9a79c1d9dcea100e63e21a73f5f80c248d08fae66d795df0ab7097c9652d0d7aa32ed847f937b661720c9863da
 EBUILD ipset-6.9.1-r2.ebuild 3397 SHA256 349e0b63af1730d016d2963a0e10519d104a33828df1d3079d345462f355427f SHA512 67fe9b4e0bac4675391f337f76bced0f9d174d456fe79fc1830cdbd4a2ffe647199da6583b018fd64cd820f14c2c7ad81c2f312787138918ed42a22bc8776143 WHIRLPOOL 1122d7270e89d35bbb8b2ba75c9ebeb8bbd3e117ff572d237b07dd404b061d82a3a1cc8bd21b945b122b9ad5ce54e5f316b12caabfcc355e0d048996d0319697
 EBUILD ipset-6.9.1.ebuild 3249 SHA256 990e629564a4849fb8aafb3344d11132298d3bb20b0653ff28b2b145dec750c5 SHA512 7134359e396ab65622dbc845d23934eac3f6a21a8ebfc1fe11f89671f28099fe0328f60cb17ae9aff1f2be8f3223b0eae82c0ec17d32720248c8e7026978e759 WHIRLPOOL bab65aa9210aa4ab8986923e933aca983b5217c3734d921546dfc2f0b79669373cc22ad103efb686976e7abfc9b8bbead45e75262443f84a6c92179d7ac8037d
-MISC ChangeLog 10985 SHA256 9f87db578a823c48b2b36fc032fa948968976a129ce3b7119b2e2360b13d1523 SHA512 cf12e6f26045a0ca7f674e115419c96e4e02d5f3a6b31a780839f69286c1f426c5b085534c2904f9ac4f3520da5380d528c50013cad20c031124fe8990b3293d WHIRLPOOL 84c15247512af8f9d82c285cc5a0000f5a051c430e7379d9990a0547bdba1797c044f54ca188061a9d60eeb4bef49235e3caa7c5dae352def62e658c9cdbc2a2
+MISC ChangeLog 11154 SHA256 29c25e37a76ebe9e068c727e930cc1c9953b507c61e26095827d521238218518 SHA512 c2b4cfb75a28e76d780357c8ac57af08ce0bf3d25172cdb256639844245bf456056000cd6a5082e1ce4dd8404f87091bd8ab99b185f6cd4122cf89a41e6c24e8 WHIRLPOOL 9c44b4795250fb4e36d90a502ddc2d8363d671ef576b88a1ff318bd4d7ae7b1970f6d2d971bfc74279845230ae525a8b3e2e24ee0161d01c1c8b8284cb9bd933
 MISC metadata.xml 261 SHA256 66f8679fb88591451a2fb75caa068efe24aa933bdf312ed6337eb74f933ac9a6 SHA512 99a93c93da21714b54c22d72c3a5abbc548f20f42facd6ef55334fb0a1247a7baf28a6514969b8bab25d08d63a3605690397223a03f1322980f301bb1d5def31 WHIRLPOOL 23fd31e561c7cfe513da8b45c2453b19fc8fa9c09014172bea6d3f70ef0beae80cac3487b34f61c18ed3d5c4f9c730eb23a3c809fb97bfd6e9d4b1037d776a77
diff --git a/net-firewall/ipset/ipset-6.15.ebuild b/net-firewall/ipset/ipset-6.15.ebuild
new file mode 100644
index 000000000000..eea2c8c4f4d2
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.15.ebuild
@@ -0,0 +1,111 @@
+# 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.15.ebuild,v 1.1 2012/11/27 11:36:44 pinkbyte 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 ~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
+}
diff --git a/net-firewall/ipset/ipset-6.16.ebuild b/net-firewall/ipset/ipset-6.16.ebuild
new file mode 100644
index 000000000000..ebe6b0c8dac7
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.16.ebuild
@@ -0,0 +1,111 @@
+# 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.16.ebuild,v 1.1 2012/11/27 11:36:44 pinkbyte 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 ~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
+}