And bump to 2.5, thanks to mva

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 185 insertions, 9 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index c58c9a55fa0a..66fdacc89c4e 100644
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/xtables-addons
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.46 2014/06/26 13:22:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.47 2014/06/26 13:44:44 maksbotan Exp $
+
+*xtables-addons-2.5 (26 Jun 2014)
+
+  26 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org> +xtables-addons-2.5.ebuild:
+  And bump to 2.5, thanks to mva
 
 *xtables-addons-2.4 (26 Jun 2014)
 
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 7bc773666cba..af0a4337f397 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -6,21 +6,23 @@ DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53
 DIST xtables-addons-2.1.tar.xz 316412 SHA256 1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79 SHA512 df8617f8dbc386e1264063fa1650a18021a199e8d301b7a2133c840f1cd54d348d5b6e46b823a778feb9682d65d898c8d31c0df35ee2b914865b126485973973 WHIRLPOOL d9146f96fb5c166e2944d45b69c929f56fb8104df9599fb9bdc4be83fc6540f26782dd8fd8866a06b7b0531207db7ce41f95439efdb07f0fa5d73a34e2028cd0
 DIST xtables-addons-2.3.tar.xz 316452 SHA256 7ab43981d594131ec8d72d4604c92c25dcf67dd4cae6aabb71113238a27cdff9 SHA512 08d529f0a2fa96ba715d2142934d6568a3c4f0ddb49f06c3c4d4ac200de0a4d2b59a4007302b557ca21014cbacda104e7781df0d5158e5313a673a928453abcc WHIRLPOOL d9929c3ede195ae87fd5b063814f2d27a0ccc772b8cc7eaee7c4d551af58e9f91e4fbbf420c058522563ea9f7ee082e280f124118bee4997763eb35738e3facc
 DIST xtables-addons-2.4.tar.xz 312564 SHA256 c765a37ea9e8324832d68fd67fdfc2189db1cb9240f2b048aca6064ba9c13cdb SHA512 650182a9078c2ce9b66a26cc0f6224e1a5fc09bb88a714b44c6d0be9fbb73f83a19ab98d085ac24f22ba564d8614d62507ff71d45c1f305f037734f23a842915 WHIRLPOOL 3dd9916cb433b38ea470280a692491b71fbaef9d515d2c32d8c52b2a7507e84e9f0c3769c80043f0f43e4ebbb676d9937a7b23a9d37ea3393e1ed0a649c4c7f1
+DIST xtables-addons-2.5.tar.xz 313732 SHA256 2aea0a6ff04d64abfe0cc80b4f23b97e058b4595ab2e29b50ef3fe30952e230d SHA512 c5053d726a1ef93806a32da87f06038c3e8239b5bb4ee226320a27696b282cc10deb44d68a02bd67a5d434a9609be89e442671a71303806df6d7c7cdefee8fd0 WHIRLPOOL e5d3f8d5bc894dc7e85a2bba051969d1ea83d5e7a60733c22723adf30cefb07d97faa88082d42589f129bb8722a8f3480ff4bae0aa5c3bfa1c69b7715f19e9cd
 EBUILD xtables-addons-1.37.ebuild 5228 SHA256 15ef815012c58c8a068d0962b0b2699fdcd20aaac1906b3b0b649c967d45e382 SHA512 21190fb4c3d0212fb29f51f232dbe762ae0f43bf6c903c18aec8f8894bdb42de80819767e25d157c263592260dc9c3636a369045475c6a1d9e2685c41158947f WHIRLPOOL c2a13ee8cc9ec0fda756213bef2d56e5df6b982f15be97fce5a1638a722083d643b2361de0f5476b7c71872f79084772474bdb626810a6daa9ad0eb5f5fa49bc
 EBUILD xtables-addons-1.47.1.ebuild 5265 SHA256 d5295bd97c8df0909859cf5e5f462777986de609e177f3c3c754e10507c30a3d SHA512 a364882eb9dd8d8b07a70b573321bb55e8d0adb79ca2773cc74274f49b05ee7ac868d267f48e7ef9bb7fdf598655771ac2304cfa1a1859c0ad17c77d929bd102 WHIRLPOOL 18c41bb43ca3a729be86a0a99a8500c706df05f00cf39c49d090f5bd53047cc2d78ec593b40a6f3039b5899a924cad77b6d031daed69d68cac4f508db62b725a
 EBUILD xtables-addons-2.1.ebuild 5096 SHA256 70d60abd4a0c3adfd79e65d512cbd8eaf9752094751c7564a7615ba2f0ca0f31 SHA512 b5171c3db68277d4055db2096b8440fec64789d96e524c4da3c1d052aa52cc650a4db7591d733d18f5a8d8a7c8f3239f1831157ac00264203e54a6770b1b6bd0 WHIRLPOOL 2bc1f8168b4ba1ef32275af72babf58f83e3ff98bb098e689a834ad13eebf69b885712f7e786c7e56da2ef009a5a7b5d0b372b6bb2affe4f89eee8b63b763533
 EBUILD xtables-addons-2.3.ebuild 5093 SHA256 8e0e08df4d4d7a3c382969050f892e97dbb3a074037921e551a9695f368bad56 SHA512 0b3a62d3c3def3d45185cf5ba506a96f7393c2f35e60a37ee6b2e647d2b6967de43c51e295186c9102842d8da2fdb80e65d5220456496322d42eb8f61c02e51d WHIRLPOOL e46496dff1879f93b5b83f94c437208e8f1b0532a0476f9b7af085da7ba4d4d0e2503ed39d0cf8c35d4efda5dc7c5c3d216fe348ae3352efb4ec67ef5d110b4b
 EBUILD xtables-addons-2.4.ebuild 5086 SHA256 662d4ab7c027f68a8adf6e432c9a2f5270af293faf1057bf7ac02d829b44ce8b SHA512 908e08739204e40f2d2c9414456a48bc260bd356f26bbd4ec0ffa007089ceebf792e1df43cea086e20ce00ec470ddf6c31c60aeaf10e818d44052e011108487d WHIRLPOOL 977d256a5e3906e572570dff5f6ffa8015cf6e89a735ac6c1e49d8c1def96ec5c22bda64aa270413f34d530dac76de95311021c8e4d10b3c8215c6e5828ec448
-MISC ChangeLog 7663 SHA256 af22b893d702d10b369bc40fe345822e7d2363477fc08548e905c72fce51fa6e SHA512 8e9a77a303a8d408e876fb29d0046bc3b822ec25c06b62600e036e982dc0dcc6b7a7b929bb9aabe499ee6af3e58cb9a867ae3dceb05671356a5bac082cd6ce4c WHIRLPOOL fcf8bb4dd44e1de4dd8de09f915885208bccf248fc46cfaeae6750a67224093fcd44aeca2295b08dc8ba51dc836e7905ceaa423bc2721e6bbc84085083d6acd8
+EBUILD xtables-addons-2.5.ebuild 5086 SHA256 b08925a71932ff7d6a727d499eb8d798ce3133d48bedefd6af30ef34afd28b08 SHA512 20545f57dd5afb59a1e03f00cb747f21c4b1008e6fef18fa2b870422dabf59ce5d113b5497dc8bea71b4ef34f125557dc287487294fcfa0e9dae834944d4c11c WHIRLPOOL beee17506e9cb1d5993d17968b56d7c88362322ef0a2d04574135583dcee98b2ba454548380efce733a2b74fc83f27e397c5a314d46efd099568e9d4bca1aa27
+MISC ChangeLog 7812 SHA256 628cc562155385e02afb999ad649f0b684789c582e0e06b71b2d6c78df59f5e6 SHA512 21e92003885f4b23c240c7f162e38e3b2a5a7e0483f94479c4fa212f3d549426d945d9535cc9309dfec0b40c2618986f4bf099b12a5017f7af5ec3b294904fe9 WHIRLPOOL f3004e1a73275f380ce5d2af911936cb38675398ab41e1c21857ff74035a78375bce823a976f0c51c86cd19e23314c18387b61f3d5e1c89de1c5a4d2b28d77ba
 MISC metadata.xml 879 SHA256 f285cbfe58c7e6eb33e8abbf92a14e20826d29020931872fa15b773b7885419e SHA512 a4eb5230ac1d2f39767d694c7ae6a86c4b90c4c64d4e18183677e5086b68e05c65e5f86f5555ef9d972595a8622f5b3893badf0077ee46559fa607986442d4a9 WHIRLPOOL 9ad00e9ca70a6205cfdc30b97526ea9afda17e0b3663a0c0a2ec7564a0837d411f2deb8648c796701cd0dbfebd7a3bd2df405098e746cdd47789ccd85ca3a314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTrB49AAoJEAmJmMX429reDJUH/3rfWQIrL9K1fLHayqaQ0XtK
-zEcMYu6Ghu8I4OqSAEaneZ3nCbSJiFG0hUcdw80477GdAVaUwmPr+x8MnPVlMdqO
-4nSm2pRQXWuEayyRB2uO0vVDY8GtW+x7tAT2uEWm/kKJi2TQ57BjnWtgQcEVaCxi
-FXRGEpYJLvGTs8DNgOo2YI/ZPpHwAh596Nw1Ql3NosxjPQomxEsT8wBEPilR0bE6
-WTNeLrVpD7rLUeK+gL4wGDqBaSEyoYDBQpqZHoOalcRugrLxqxZkHjGMiRRKmGgG
-ZpnPe6fg2pe+LAKEbLmCEjFJK3/4nZXrYSruQc9HB4JUty80pKaNRkqR0ngMGvA=
-=zIyd
+iQEcBAEBCAAGBQJTrCNqAAoJEAmJmMX429reX1oH/1D2sE//Cjn7/mZdojwb19V6
+3piTkMjJS4u8BVOeyN7uQc2LHY2RosSJEyBwtumT4qXWxsD2qDvHLA130choC6Fo
+EdzNnUctka1t+Allp2LCPxfquApQHCb+sgVqy5dktl6s9qqJP1XHCCVlyJS74P1h
+YUxuRMJu3+bDq9OhXDT8CpsqEuh2T60lxUt8sBn1VpiF4lz15cNutN2vQtXonc9b
+fZAgzjvJHM4Z0Yq5y+GKdv4FEm9wZDZNkMxve+f4TqVfzkpFBwJPNvNleslLvKcu
+LioWU+39x64EkhvJ9u2vKiAuxvpXYe1jV2FJ5keXCDEuwHFCanl4Dq95QOjQQn4=
+=Li4L
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/xtables-addons-2.5.ebuild b/net-firewall/xtables-addons/xtables-addons-2.5.ebuild
new file mode 100644
index 000000000000..c044248fc475
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-2.5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.5.ebuild,v 1.1 2014/06/26 13:44:44 maksbotan Exp $
+
+EAPI="5"
+
+inherit eutils linux-info linux-mod multilib
+
+DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
+HOMEPAGE="http://xtables-addons.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="modules"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.4.5"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+# XA_kernel_check tee "2 6 32"
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${2}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup()	{
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}