Version bump.

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

3 files changed, 146 insertions, 2 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index d58221b30d69..1aba95585a77 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.1 2010/04/29 09:31:02 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.2 2010/05/08 06:52:48 pva Exp $
+
+*xtables-addons-1.26 (08 May 2010)
+
+  08 May 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.26.ebuild:
+  Version bump.
 
 *xtables-addons-1.25 (29 Apr 2010)
 
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 433a5f85f813..a880d9318b80 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,4 +1,6 @@
 DIST xtables-addons-1.25.tar.bz2 366332 RMD160 6abcf7d353c34729430cf783210a3f83fc361c99 SHA1 f39143144dcdddf337d57bdd46f8909e434b2675 SHA256 341aaec8204c8cc0351c35532708d852be1e96d5f1586617539e1c57577c8939
+DIST xtables-addons-1.26.tar.bz2 366206 RMD160 da5ac08897715ec30ee8e7681ca7dc5dd8669328 SHA1 a33feb4bdad40549ac2d697a0aef94fb6a107b2a SHA256 b05adfc676d5eb5e58c4d273677725d35248c4cb30859a3a53045d03818f591e
 EBUILD xtables-addons-1.25.ebuild 4000 RMD160 c5da73d3efb82533f2aab219b64d30895a91b5a0 SHA1 df1a266bceaa080a1a9fd956849ae96afaefe217 SHA256 94cffaefca70ddc21753e63e9852288402f6851820820cb6709df4d909eac85a
-MISC ChangeLog 473 RMD160 099e61726f89d874115048e8d1a1695fbad18c45 SHA1 0255516f0b8994d3d7db170cb89a04afd4158aa4 SHA256 054a9f2626fd0c188a99fb1820e929b333320062db351cc9d13595c8c1ddf663
+EBUILD xtables-addons-1.26.ebuild 3994 RMD160 dbf7ac6248838305d6525295034d0ffa53ceb7df SHA1 fbb981fa074714f223f818e99ddc201e7fc1fbd1 SHA256 1738c269f5b826be9f0891b2685bbee9ca45bb49f649628d405a1f9d288f85a0
+MISC ChangeLog 600 RMD160 27d492885d7e604b1bd701688f11ba1994c6f9e4 SHA1 affb5eb02ce90e5d24c5f69631aa4fcda390f44f SHA256 e763aae5e310c2f67f5e4075633797368b5727dafc141bdf97e8f21c92d0089c
 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad
diff --git a/net-firewall/xtables-addons/xtables-addons-1.26.ebuild b/net-firewall/xtables-addons/xtables-addons-1.26.ebuild
new file mode 100644
index 000000000000..324962a30723
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.26.ebuild
@@ -0,0 +1,137 @@
+# 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.26.ebuild,v 1.1 2010/05/08 06:52:48 pva Exp $
+
+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"
+
+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_${mod}"
+done
+
+RDEPEND="virtual/modutils
+	>=net-firewall/iptables-1.4.3
+	>virtual/linux-sources-2.6.22
+	xtables_addons_ipset? ( !net-firewall/ipset )"
+
+DEPEND="${RDEPEND}"
+
+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,am} || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.{in,am} || die
+}
+
+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=/ \
+		--libexecdir=/lib/ \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || 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 "${D}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}