net-firewall/xtables-addons: Version bump.

svn path=/; revision=372

3 files changed, 127 insertions, 97 deletions

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index c449edd..294e383 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,2 +1,3 @@
-DIST xtables-addons-1.17.tar.bz2 342939 RMD160 d8370b8881d31019c6a99557ab238483a8a787a8 SHA1 4d18ec503b655308752a65b5d0d75c8f9ff19ac7 SHA256 03055e0a9df88360613e25029d69cfb5412c90c23304f5f159f12688300a57ea
-EBUILD xtables-addons-1.17.ebuild 2795 RMD160 1d523b5210a7e5d7e2d8bdd872eefc9db7b9167d SHA1 4c3a6f137f0e220f4725c9fba87d14cb7866dfa3 SHA256 74e1666c34d0ae4ed559e7cd1041140a5c6c7774f4c206cbe04183f029b86a55
+AUX xtables-addons-1.21-build.patch 482 RMD160 ae378882543e8951d4f66b3845044d18672673be SHA1 329ade8fb2ab7ebc1b677cc2495aa6e91007e660 SHA256 39097fd71b376c66cdb32478942653d23da5eb6d8003d6072592647f1d6b9213
+DIST xtables-addons-1.21.tar.bz2 366687 RMD160 10a0b4d61ce48de45739ccc317683423ba49c7b7 SHA1 40a078787a61100c6d99c121f8112a186fb9d9f4 SHA256 ebf2bbe07999309b4cb61ac4b58fa3312bb348669ee374c29dd91bd2ebf81285
+EBUILD xtables-addons-1.21.ebuild 3549 RMD160 81fb46b490f55e9b98c4206b0c34496a56e2fdf3 SHA1 7509632b56e0b222fdd7ecfa7fe231157d5b1db1 SHA256 88e8560672392e8f5294fe4673b7384fe93a424486377f7fe276d45d0c9e191c
diff --git a/net-firewall/xtables-addons/xtables-addons-1.17.ebuild b/net-firewall/xtables-addons/xtables-addons-1.17.ebuild
deleted file mode 100644
index feb756c..0000000
--- a/net-firewall/xtables-addons/xtables-addons-1.17.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-MODULES="quota2 lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude chaos"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_modules_${mod}"
-done
-
-RDEPEND="virtual/modutils
-	>=net-firewall/iptables-1.4.3
-	>virtual/linux-sources-2.6.22
-	xtables_addons_modules_ipset? ( !net-firewall/ipset )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup()	{
-	get_version
-	check_modules_supported
-	# CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22
-	CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	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
-
-	for mod in ${MODULES}; do
-		if use xtables_addons_modules_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if [[ ${mod} != ipset ]]; then
-				MODULE_NAMES+=" xt_$(sed -n "s/build_\(${mod}\)=.*/\1/Ip" mconfig)(xtables_addons:${S}/extensions:)"
-			else
-				for ipset_mod in $(sed -n '/^obj-m/{s:obj-m [+]= ::;s:[.]o::g;p}' "${S}/extensions/ipset/Kbuild"); do
-					MODULE_NAMES+=" ${ipset_mod}(xtables_addons:${S}/extensions/ipset:)"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-
-	if [[ -z ${MODULE_NAMES} ]]; then
-		eerror "All modules are disabled. What do you want me to build?"
-		eerror "Please, set XTABLES_ADDONS_MODULES to any of"
-		eerror "${MODULES}"
-		die "All modules are disabled."
-	fi
-
-	MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)${MODULE_NAMES}"
-
-	sed -e 's/depmod -a/true/' -i Makefile.{in,am} || die
-	sed -e '/^all:/{s:modules ::}' \
-		-e '/^install:/{s: modules_install::}' -i extensions/GNUmakefile.in || die
-}
-
-src_configure() {
-	econf --prefix=/ \
-		--libexecdir=/lib/ \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-	# don't build modules in ipset directory (linux-mod_src_compile builds all)
-	touch ${S}/extensions/ipset/.built
-	BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	linux-mod_src_install
-	dodoc README doc/changelog.txt || die
-}
-
diff --git a/net-firewall/xtables-addons/xtables-addons-1.21.ebuild b/net-firewall/xtables-addons/xtables-addons-1.21.ebuild
new file mode 100644
index 0000000..90b023e
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.21.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils linux-mod
+
+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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_modules_${mod}"
+done
+
+RDEPEND="virtual/modutils
+	>=net-firewall/iptables-1.4.3
+	>virtual/linux-sources-2.6.22
+	xtables_addons_modules_ipset? ( !net-firewall/ipset )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup()	{
+	get_version
+	check_modules_supported
+	# CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22
+	CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK"
+	linux-mod_pkg_setup
+}
+
+# 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() {
+	for mod in ${MODULES}; do
+		use xtables_addons_modules_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS_MODULES to any 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
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	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
+		echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	for mod in ${MODULES}; do
+		if use xtables_addons_modules_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			for module_name in $(XA_get_module_name ${mod}); do
+				MODULE_NAMES+=" ${module_name}"
+			done
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+
+	sed -e 's/depmod -a/true/' -i Makefile.{in,am} || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.{in,am} || die
+	epatch "${FILESDIR}/xtables-addons-1.21-build.patch"
+}
+
+src_configure() {
+	unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources
+	econf --prefix=/ \
+		--libexecdir=/lib/ \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+	BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	linux-mod_src_install
+	dodoc README doc/* || die
+}
+