Version bump.

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

3 files changed, 181 insertions, 12 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 6866e75586f4..d235df17ea65 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.26 2011/09/25 15:49:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.27 2011/10/02 08:31:21 pva Exp $
+
+*xtables-addons-1.39 (02 Oct 2011)
+
+  02 Oct 2011; Peter Volkov <pva@gentoo.org> +xtables-addons-1.39.ebuild:
+  Version bump.
 
   25 Sep 2011; Sven Wegener <swegener@gentoo.org> xtables-addons-1.37.ebuild,
   xtables-addons-1.38.ebuild:
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index a7bc8a0a5d1b..d54c23541293 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xtables-addons-1.37.tar.xz 423784 RMD160 901bafe76977e0cfc9b5c8c6a4d2603c7790acb3 SHA1 6eab42320590a5b338ab06ad5202e3d54df298ba SHA256 2b60a3ae1c71a5b802625b595edceb14ea0be1fb5517e98a9542c5a1157fb7b6
 DIST xtables-addons-1.38.tar.xz 424488 RMD160 2ff297999ef90401bbdf14c05dfa5c4d5870ce94 SHA1 4c7550a93eefac555a81961b76b9c09b7d2237cc SHA256 c4365028fd9778184dcd1e10b6a591fbb1bfb6dcdd891fda467346b5920a6017
+DIST xtables-addons-1.39.tar.xz 379928 RMD160 0ad856c8802194d1489c038ac6078a54e49bf5de SHA1 87b9c4c96c246529aeeb38ee084f42810eeafe3b SHA256 ef7a89405c97879efee9944237373c3ecff36e9512aba948e7b40ae005a8946b
 EBUILD xtables-addons-1.37.ebuild 5228 RMD160 c13a3f9357eaff45e9a2e010872dc4bc6f094dd0 SHA1 f5ab38e3eb54e5bb3d60dd40b3ea97b0650885ca SHA256 15ef815012c58c8a068d0962b0b2699fdcd20aaac1906b3b0b649c967d45e382
 EBUILD xtables-addons-1.38.ebuild 5575 RMD160 b2279a2cdd96a06b002a68393fb12afc7701a6a3 SHA1 eb175df0bc08654ee749cc50e769d763429036c1 SHA256 19a3c5949e827c440f22d6ffd025ff3df46bb8a20014da8d064ea7e68c533ca4
-MISC ChangeLog 4928 RMD160 bc6cd7acf41d3ab205d30016ba349470bf9bd00a SHA1 aa60ea36703115cdc99aa4690d5de4a0f695c336 SHA256 95df153f8a7627eb010dea57fce297339099a32faefbf44ff77661bb42710e57
+EBUILD xtables-addons-1.39.ebuild 5362 RMD160 cea1f861893075805d3268acc653e4806b977457 SHA1 60fb73b6655add5bb068a140a7ba3b23fc1a99e7 SHA256 d42f97d6f44752b817e47b56e091ba299b9e02f89583a5c7958554fd186334e4
+MISC ChangeLog 5050 RMD160 89daaa7b2af0818e5a7a89792d83cadb991f07b3 SHA1 74d22222f4089f1c0f6ba4a82af5bd68c3d79c69 SHA256 24d24f214589f95c1ab0b2ee66460ecd00d8dc4b40cd7799c81023642f3adc74
 MISC metadata.xml 662 RMD160 5db237fedc9b879dd930e795bfee12e00e005f7d SHA1 33db161ad79888894c10c0c5ad6f114904fba40d SHA256 15c6f111a1526ee1fc5467075d607c55f681dd6b5f156c8b0ea05447edb930b9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5/TX8ACgkQI1lqEGTUzyRQdgCfen8WR6jiXZ6P2S1+xZowDMTx
-jZkAn0eWUQ0JcR9IabkW+8/XixEMsDME
-=yZfV
------END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/xtables-addons-1.39.ebuild b/net-firewall/xtables-addons/xtables-addons-1.39.ebuild
new file mode 100644
index 000000000000..2f09d1edf42d
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.39.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 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.39.ebuild,v 1.1 2011/10/02 08:31:22 pva Exp $
+
+EAPI="4"
+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 ipset6 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.3"
+
+RDEPEND="${DEPEND}
+	xtables_addons_ipset6? (
+		!net-firewall/ipset
+		net-libs/libmnl )
+	xtables_addons_geoip? ( virtual/perl-Getopt-Long
+		dev-perl/Text-CSV_XS )"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+# XA_kernel_check tee "2 6 26"
+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 ipset6"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		if use xtables_addons_ipset6 && kernel_is -lt 2 6 35; then
+			die "${PN} with ipset requires kernel version >= 2.6.35"
+		fi
+		kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29"
+		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 '{}' '+'
+}