Version bump, thanks to mike <mishanq AT gmail.com>, wrt bug #397749

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

3 files changed, 181 insertions, 2 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 942021e075b1..6fe491345a76 100644
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/xtables-addons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.30 2012/12/27 10:39:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.31 2012/12/29 17:12:26 pinkbyte Exp $
+
+*xtables-addons-1.47.1 (29 Dec 2012)
+
+  29 Dec 2012; Sergey Popov <pinkbyte@gentoo.org>
+  +xtables-addons-1.47.1.ebuild:
+  Version bump, thanks to mike <mishanq AT gmail.com>, wrt bug #397749
 
 *xtables-addons-1.45 (27 Dec 2012)
 
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 85b6ee394534..6c6b9abc1a12 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -2,9 +2,11 @@ DIST xtables-addons-1.37.tar.xz 423784 SHA256 2b60a3ae1c71a5b802625b595edceb14ea
 DIST xtables-addons-1.38.tar.xz 424488 SHA256 c4365028fd9778184dcd1e10b6a591fbb1bfb6dcdd891fda467346b5920a6017
 DIST xtables-addons-1.39.tar.xz 379928 SHA256 ef7a89405c97879efee9944237373c3ecff36e9512aba948e7b40ae005a8946b
 DIST xtables-addons-1.45.tar.xz 317316 SHA256 b18113ca9320240eb7f33997a3d5b5da33d12c5f03cbe13da11c98fe0983341c SHA512 4853b37d489e922a2a315bc5c871cb2f73d66cd1d219cbdbc28a4419d24995be704526f91b576977b1ff5e51a21e5e49f78ae41e6ebf3b169c60f891676a080b WHIRLPOOL 199cfd156eaca9d31fd61434ae2c6a5f09453d7f6ce7d0a2ab92723e0ee78df20f7a30cb7eb74d6111790577bcc1a2cfdfbee0d74f1980535ddd7025559c6083
+DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
 EBUILD xtables-addons-1.37.ebuild 5228 SHA256 15ef815012c58c8a068d0962b0b2699fdcd20aaac1906b3b0b649c967d45e382 SHA512 21190fb4c3d0212fb29f51f232dbe762ae0f43bf6c903c18aec8f8894bdb42de80819767e25d157c263592260dc9c3636a369045475c6a1d9e2685c41158947f WHIRLPOOL c2a13ee8cc9ec0fda756213bef2d56e5df6b982f15be97fce5a1638a722083d643b2361de0f5476b7c71872f79084772474bdb626810a6daa9ad0eb5f5fa49bc
 EBUILD xtables-addons-1.38.ebuild 5575 SHA256 19a3c5949e827c440f22d6ffd025ff3df46bb8a20014da8d064ea7e68c533ca4 SHA512 2e4936ad623359aef07c711254473c995345c5b268775338c8c214ce84bff46d6c46b4bf3bb8debea96fc63bfda86f8dffd06d3ee9d5e6bac1862aa523719a40 WHIRLPOOL 6fc29ddf6b1268f2e0141399ff212476a322d5524d4c85d75519e68dd8c758cc0fa551a79fb5b113e5a722d38bd099bbb2518cf2f7f87830ca1938dd4b5fb5ac
 EBUILD xtables-addons-1.39.ebuild 5384 SHA256 ad6d93a0f1ae2bb74d9afb0078a83411855af1304616616c146b31c741be1a4c SHA512 5b1df369a53ddf04588a4a9439890509fb147a4b0123e96560f509145e237ceb5c705c65878f86c190a123b54be00216a8641aa0873b4c57dd7a158f052560c7 WHIRLPOOL 13ddcc1d8f8c5ee9785c1fc09df7549786294612602b0769bfb5f4cdfffbcf65a78df28f6260eb876dda1ea05fdb564493a7e911c4a8eac06dd844c915229de7
 EBUILD xtables-addons-1.45.ebuild 5181 SHA256 448a0a164d1eb73afd21f438f7d48c5e99c876129c70537b6a07d385fc5ad461 SHA512 a7838059c502c87831ca3a83374ab3cdcdcb86add801d306adfbdadfa6a6c7981b3a5f2909771016c188f97ea2bc461c79bc45fb4598e6bb23dfceeac67bd992 WHIRLPOOL 295b5a6865fe5a3f8fcbabe3f3ce6fdc0e3961721831a8e14bf8fbf4841980cf48dcc7e2711583419ae35cd83e45d73491db90378b54047777374baa269bfde9
-MISC ChangeLog 5483 SHA256 f76ecd01163988e36c2ab8b1fc2a98d35ac15bb359f48a30eaf649a2ad2acb95 SHA512 83b45c951cf4fb03c705a7598d2ac57450940df2a955acf4ee6b171306e944579125fdb2f1e32347f65ac556749c61e14ab54495c47d09d440c0d0df51e94c5b WHIRLPOOL d0dd6f8b2166d1855b1a326a1b37353fe8d31ec8da30dd7bf5a209877f91fcf2be253e7a59031230c19395747da0e58b6f4e79d6d222d0c0a2184014e8c11dbc
+EBUILD xtables-addons-1.47.1.ebuild 5183 SHA256 ca2113b49a5ac89e311db1a00cb33fc68e1b24f6cec719ab2affa2b512a3e5c8 SHA512 923141f8ca5a95e41eac99f42a7e4ac2d277557a31f0fdbe3732a3dd988837ca39da073bd2e0283a05715da8e4a5d1d385c8a139864f6d35853e73a3bff4421d WHIRLPOOL 50831e8bac3b7cbfce3728775b3bf6cdf619ded2aaaab98b2b23771f5e7fe756111b8da088f85391475595b61c33e49ea2a097a4a10c29fb2eb2e83c8f339db9
+MISC ChangeLog 5676 SHA256 845a27e1c0e0e91e7d3b6b5e8a82a1d1769ab008f00b2b05c3beb32fc887c9e0 SHA512 efb415916b04f2839609dc8ee1560ff8ccc818a37f10cf2faa43e9dfb2fd5ac4ef1368daa6abed37c5e58fc92ba33af89384eec15bf8fada2a2e77afcda3cf9a WHIRLPOOL 4fb6548da9b0947479dacb0b835f377c4a8719724ec3acc9cd054c6568e8f212773d6cab63935618132693f0dc090e26f1f561107a717620f6981342f6ee1bc9
 MISC metadata.xml 916 SHA256 32daf869735e357d94fb6f6725e013f83469ee5285b4219fcb46c48f3b105524 SHA512 c5905fb6617525ea9e2f105850eb4a6d98defa013f108fdfbdd33dc71fee01dc7bf51c000db786ffabce409d6c00439b0e582eae735a18477aafe687c07c0419 WHIRLPOOL 98e2be7e4c3fd4fc904920fb9f05e03a0e08fb3c4e516f07c58ca6484dfd8ed615dd5da52a87d1c9b4bdebf368246a40492088e3df342957f5e76d5d80b301d8
diff --git a/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild b/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild
new file mode 100644
index 000000000000..83d01888fc9f
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild,v 1.1 2012/12/29 17:12:26 pinkbyte 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 tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum 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 2 6 32 && die "${PN} requires kernel version >= 2.6.32"
+		XA_check4internal_module tee "2 6 35" NETFILTER_XT_TARGET_TEE
+		XA_check4internal_module checksum "2 6 36" NETFILTER_XT_TARGET_CHECKSUM
+	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_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 '{}' '+'
+}