Don't install geoip scripts in case it is disabled and add correct depends for them, bug 332495, thank Marcin Mirosław for report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 150 insertions, 2 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 7d8b35c7fa6a..cf01317a28d9 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.5 2010/08/12 13:28:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.6 2010/08/13 06:53:16 pva Exp $
+
+*xtables-addons-1.28-r1 (13 Aug 2010)
+
+  13 Aug 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.28-r1.ebuild:
+  Don't install geoip scripts in case it is disabled and add correct depends
+  for them, bug 332495, thank Marcin Mirosław for report.
 
 *xtables-addons-1.28 (12 Aug 2010)
 
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index df750cb4fa77..c69b9e167dc2 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,6 +1,7 @@
 DIST xtables-addons-1.27.tar.xz 331224 RMD160 b02de2955d123eacca0097c4cf256c1a221e7583 SHA1 a0ac6a28de3258629c9020394f69bda5eae54e54 SHA256 e3215df244a97175d8fe5a7d473978ba8a0026478eaac6daeb2f44a3f47fca7c
 DIST xtables-addons-1.28.tar.xz 333440 RMD160 b9906c6d08870ed6e3c9e2843b16e22df2442092 SHA1 1c1a7e1be38ef1a756b504c90dd5cdffa696e2ac SHA256 3d06d6d1d8b8adeae7c9edee20ffd3f2a754eb0b187e8b9f397666e26a7dbbcc
 EBUILD xtables-addons-1.27.ebuild 4031 RMD160 fdddf285c8b85a650bc3c95184ea3aabc3656eaa SHA1 9c230396e5b939a9e62575c2b7e7d05025996b33 SHA256 02cdfa8893860295e016d1145b516c5a31fb815ea45d41203b0a51f186db43cc
+EBUILD xtables-addons-1.28-r1.ebuild 4194 RMD160 83f821362354bf0f9c0d0f229cf71fcc98694a15 SHA1 af98c486c32f4da5dc3d67e2157e62d300429f0f SHA256 2c43bf5cf7d859773d92a0424c8aad6b1b04e94adb553406b91a9c323a681480
 EBUILD xtables-addons-1.28.ebuild 4040 RMD160 0633f3d5d2ddd6cd6b5fe16985652d1aa8168cb4 SHA1 0c589179ad921830ccd3567ede413b607916430f SHA256 55d374bd2dc8f2092cfcd7d511a1173db3ef5de01cfbe362f3738da9b1119b2e
-MISC ChangeLog 1119 RMD160 7ee15d31a9dede0bfa6d3a507b88a6f9869d91a9 SHA1 3961e8b5a901d030307ec9e92ba1a502655ba30d SHA256 19473ab6c36c7e1d347ae3c7e2f93ae5dd71af15fc9495ba8cc28bda07123b46
+MISC ChangeLog 1372 RMD160 17825315354bb02ed68cb7d01749821e3f847860 SHA1 edf028abf6553603199e54bd844a3ae7590ad199 SHA256 9e61ce145b17bdba216f65af3b8b3e21bb366b2bd266bff0a6d19b532d2f8771
 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad
diff --git a/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild b/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild
new file mode 100644
index 000000000000..91f7b1761018
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2010 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.28-r1.ebuild,v 1.1 2010/08/13 06:53:16 pva Exp $
+
+EAPI="3"
+
+inherit eutils 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 ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude checksum chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND="virtual/modutils
+	>=net-firewall/iptables-1.4.3
+	>virtual/linux-sources-2.6.22
+	xtables_addons_ipset? ( !net-firewall/ipset )"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? ( virtual/perl-Getopt-Long
+		dev-perl/Text-CSV_XS )"
+
+pkg_setup()	{
+	if use modules; then
+		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
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+		fi
+	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
+	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
+		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 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
+
+	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() {
+	unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources
+	export KBUILD_EXTMOD=${S} # Avoid build in /usr/src/linux #250407
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 || die
+	use modules && BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	use modules && linux-mod_src_install
+	dodoc README doc/* || die
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}