net-firewall/xtables-addons: Version bump. Hopefully fixed ACCESS VIOLATION, #250407

svn path=/; revision=406

5 files changed, 29 insertions, 230 deletions

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 2fdeddd..c10a10e 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,5 +1,2 @@
-AUX xtables-addons-1.22-ECHO-build.patch 1638 RMD160 71a4bbea5fe9d4a552926cd8cf23d3d1a4dd8478 SHA1 68895480994b71b2cb13fd40cacf390346d95c1b SHA256 b353abecbd9f4e1f0393dea9081b98066541daf154b4a7d1e4f3d51434d2598f
-AUX xtables-addons-1.22-RAWNAT-ipv6.patch 3047 RMD160 27afde86ebec7a3bda5504ee63c499acac05b0d6 SHA1 27323a1a69cae42071b688575caec7893ef47476 SHA256 40e955a065af5042ee177c0963cb6501175d8c0033a8e4be0186091e73de2794
-AUX xtables-addons-1.22-SYSRQ-ipv6.patch 1664 RMD160 a53eabefdef1aa33700c0ff08dc3d04a7cc42288 SHA1 6275b2cd76834b9d95ccabab0e1e53ef74e403d2 SHA256 8dc7da28cf1a12fef58e5bb39b87ca8172da3664e58c4128010aef744a84394e
-DIST xtables-addons-1.22.tar.bz2 366217 RMD160 f54696fb050eaf6061e48df142c72d0c8aa2626c SHA1 ff42aacb6b8fa5f6e204982bacab209f48a89bd4 SHA256 32916dee3da608b554d71e89a9cba74d2078d2be78684ccb6184b2afc8688719
-EBUILD xtables-addons-1.22.ebuild 3794 RMD160 d1224d73b60b2e4f796cf545c8c969fc3fa5372b SHA1 3910910c647874131a1739f6fb343c7c597c6bcc SHA256 e84e4668d19f91d96f2536eb68ae832a377c955b5b500fb018e0821f8a946c5a
+DIST xtables-addons-1.23.tar.bz2 366416 RMD160 f71b3f20ae3784e2314a039bc04bd28fe268823f SHA1 dbd63d0ce64081ed27a5191fd3bfccc8cb46c2f9 SHA256 a3914c221cdcedc7fb2497d7b6c3c568f101271c7073b0114997a728a224bb75
+EBUILD xtables-addons-1.23.ebuild 4022 RMD160 c084436b762581d3e28d3222db2fff71e9aa7d6b SHA1 49cfdf0fcf2f6055cf2b444a6c6709dca63aeed6 SHA256 a841ad13db161a635a4c6eae18125ec670eac3716d0c132729160c184e1cc367
diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.22-ECHO-build.patch b/net-firewall/xtables-addons/files/xtables-addons-1.22-ECHO-build.patch
deleted file mode 100644
index 8b42ca6..0000000
--- a/net-firewall/xtables-addons/files/xtables-addons-1.22-ECHO-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Jan Engelhardt <jengelh@medozas.de>
-Date: Wed, 3 Feb 2010 18:34:41 +0000 (+0100)
-Subject: ECHO: update to use skb_dst
-X-Git-Url: http://xtables-addons.git.sourceforge.net/git/gitweb.cgi?p=xtables-addons%2Fxtables-addons;a=commitdiff_plain;h=cf7a40fbe7509909bc44ad1f1d7e86ba016220b9;hp=0de9f38412331231f66c7104f56065ef7c495908
-
-ECHO: update to use skb_dst
----
-
-diff --git a/extensions/xt_ECHO.c b/extensions/xt_ECHO.c
-index f630cec..456403c 100644
---- a/extensions/xt_ECHO.c
-+++ b/extensions/xt_ECHO.c
-@@ -32,7 +32,7 @@ echo_tg4(struct sk_buff **poldskb, const struct xt_target_param *par)
- 	unsigned int addr_type, data_len;
- 	void *payload;
- 
--	printk(KERN_INFO "dst_out=%p\n", (*poldskb)->dst->output);
-+	printk(KERN_INFO "dst_out=%p\n", skb_dst(*poldskb)->output);
- 
- 	/* This allows us to do the copy operation in fewer lines of code. */
- 	if (skb_linearize(*poldskb) < 0)
-@@ -84,18 +84,17 @@ echo_tg4(struct sk_buff **poldskb, const struct xt_target_param *par)
- #endif
- 		addr_type = RTN_LOCAL;
- 
--	/* ip_route_me_harder expects skb->dst to be set */
--	dst_hold(oldskb->dst);
--	newskb->dst = oldskb->dst;
-+	/* ip_route_me_harder expects the skb's dst to be set */
-+	skb_dst_set(newskb, dst_clone(skb_dst(oldskb)));
- 
- 	if (ip_route_me_harder(&newskb, addr_type) < 0)
- 		goto free_nskb;
- 
--	newip->ttl        = dst_metric(newskb->dst, RTAX_HOPLIMIT);
-+	newip->ttl        = dst_metric(skb_dst(newskb), RTAX_HOPLIMIT);
- 	newskb->ip_summed = CHECKSUM_NONE;
- 
- 	/* "Never happens" (?) */
--	if (newskb->len > dst_mtu(newskb->dst))
-+	if (newskb->len > dst_mtu(skb_dst(newskb)))
- 		goto free_nskb;
- 
- 	nf_ct_attach(newskb, *poldskb);
diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.22-RAWNAT-ipv6.patch b/net-firewall/xtables-addons/files/xtables-addons-1.22-RAWNAT-ipv6.patch
deleted file mode 100644
index 008eaea..0000000
--- a/net-firewall/xtables-addons/files/xtables-addons-1.22-RAWNAT-ipv6.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-commit 646fd4275f91a6e10823b1d6ad2df1581aec7bb5
-Author: Peter Volkov <pva@gentoo.org>
-Date:   Fri Feb 19 14:06:00 2010 +0300
-
-    RAWNAT: make ipv6 support conditional
-    
-    In case kernel is built without ipv6 support this module fails as it
-    assumes ipv6. This patch makes kernel support conditional on kernel
-    .config.
-
-diff --git a/extensions/ip6table_rawpost.c b/extensions/ip6table_rawpost.c
-index 1cd9b26..c1e6102 100644
---- a/extensions/ip6table_rawpost.c
-+++ b/extensions/ip6table_rawpost.c
-@@ -9,6 +9,8 @@
- #include "compat_xtables.h"
- #include "compat_rawpost.h"
- 
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+
- enum {
- 	RAWPOST_VALID_HOOKS = 1 << NF_INET_POST_ROUTING,
- };
-@@ -105,3 +107,5 @@ module_init(rawpost6_table_init);
- module_exit(rawpost6_table_exit);
- MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>");
- MODULE_LICENSE("GPL");
-+
-+#endif
-diff --git a/extensions/xt_RAWNAT.c b/extensions/xt_RAWNAT.c
-index 18661a9..b8c7bc7 100644
---- a/extensions/xt_RAWNAT.c
-+++ b/extensions/xt_RAWNAT.c
-@@ -22,6 +22,10 @@
- #include "compat_xtables.h"
- #include "xt_RAWNAT.h"
- 
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+#	define WITH_IPV6 1
-+#endif
-+
- static inline __be32
- remask(__be32 addr, __be32 repl, unsigned int shift)
- {
-@@ -29,6 +33,7 @@ remask(__be32 addr, __be32 repl, unsigned int shift)
- 	return htonl((ntohl(addr) & mask) | (ntohl(repl) & ~mask));
- }
- 
-+#ifdef WITH_IPV6
- static void
- rawnat_ipv6_mask(__be32 *addr, const __be32 *repl, unsigned int mask)
- {
-@@ -72,6 +77,7 @@ rawnat_ipv6_mask(__be32 *addr, const __be32 *repl, unsigned int mask)
- 		break;
- 	}
- }
-+#endif
- 
- static void rawnat4_update_l4(struct sk_buff *skb, __be32 oldip, __be32 newip)
- {
-@@ -162,6 +168,7 @@ rawdnat_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
- 	return XT_CONTINUE;
- }
- 
-+#ifdef WITH_IPV6
- static bool rawnat6_prepare_l4(struct sk_buff **pskb, unsigned int *l4offset,
-     unsigned int *l4proto)
- {
-@@ -274,6 +281,7 @@ rawdnat_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
- 	memcpy(&iph->daddr, &new_addr, sizeof(new_addr));
- 	return XT_CONTINUE;
- }
-+#endif
- 
- static bool rawnat_tg_check(const struct xt_tgchk_param *par)
- {
-@@ -296,6 +304,7 @@ static struct xt_target rawnat_tg_reg[] __read_mostly = {
- 		.checkentry = rawnat_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#ifdef WITH_IPV6
- 	{
- 		.name       = "RAWSNAT",
- 		.revision   = 0,
-@@ -305,6 +314,7 @@ static struct xt_target rawnat_tg_reg[] __read_mostly = {
- 		.checkentry = rawnat_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#endif
- 	{
- 		.name       = "RAWDNAT",
- 		.revision   = 0,
-@@ -314,6 +324,7 @@ static struct xt_target rawnat_tg_reg[] __read_mostly = {
- 		.checkentry = rawnat_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#ifdef WITH_IPV6
- 	{
- 		.name       = "RAWDNAT",
- 		.revision   = 0,
-@@ -323,6 +334,7 @@ static struct xt_target rawnat_tg_reg[] __read_mostly = {
- 		.checkentry = rawnat_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#endif
- };
- 
- static int __init rawnat_tg_init(void)
diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.22-SYSRQ-ipv6.patch b/net-firewall/xtables-addons/files/xtables-addons-1.22-SYSRQ-ipv6.patch
deleted file mode 100644
index b7e160c..0000000
--- a/net-firewall/xtables-addons/files/xtables-addons-1.22-SYSRQ-ipv6.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit fdbae5d62bea5775eaf412bbcb2c3d98d26f4c02
-Author: Peter Volkov <pva@gentoo.org>
-Date:   Fri Feb 19 14:46:17 2010 +0300
-
-    SYSRQ: make ipv6 support conditional
-    
-    In case kernel is built without ipv6 support this module fails as it
-    assumes ipv6. This patch makes kernel support conditional on kernel
-    .config.
-
-diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
-index 3cd223b..95c1184 100644
---- a/extensions/xt_SYSRQ.c
-+++ b/extensions/xt_SYSRQ.c
-@@ -23,6 +23,10 @@
- #include <net/ip.h>
- #include "compat_xtables.h"
- 
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+#	define WITH_IPV6 1
-+#endif
-+
- static bool sysrq_once;
- static char sysrq_password[64];
- static char sysrq_hash[16] = "sha1";
-@@ -214,6 +218,7 @@ sysrq_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
- 	return sysrq_tg((void *)udph + sizeof(struct udphdr), len);
- }
- 
-+#ifdef WITH_IPV6
- static unsigned int
- sysrq_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
- {
-@@ -242,6 +247,7 @@ sysrq_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
- 		       ntohs(udph->dest), len);
- 	return sysrq_tg(udph + sizeof(struct udphdr), len);
- }
-+#endif
- 
- static bool sysrq_tg_check(const struct xt_tgchk_param *par)
- {
-@@ -278,6 +284,7 @@ static struct xt_target sysrq_tg_reg[] __read_mostly = {
- 		.checkentry = sysrq_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#ifdef WITH_IPV6
- 	{
- 		.name       = "SYSRQ",
- 		.revision   = 1,
-@@ -286,6 +293,7 @@ static struct xt_target sysrq_tg_reg[] __read_mostly = {
- 		.checkentry = sysrq_tg_check,
- 		.me         = THIS_MODULE,
- 	},
-+#endif
- };
- 
- static int __init sysrq_tg_init(void)
diff --git a/net-firewall/xtables-addons/xtables-addons-1.22.ebuild b/net-firewall/xtables-addons/xtables-addons-1.23.ebuild
index ac8ada7..973459b 100644
--- a/net-firewall/xtables-addons/xtables-addons-1.22.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-1.23.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+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"
 
@@ -33,11 +33,17 @@ RDEPEND="virtual/modutils
 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
+	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.
@@ -53,6 +59,7 @@ XA_qa_check() {
 
 # Is there any use flag set? 
 XA_has_something_to_build() {
+	local mod
 	for mod in ${MODULES}; do
 		use xtables_addons_${mod} && return
 	done
@@ -81,7 +88,8 @@ XA_get_module_name() {
 				"${objdir}/Kbuild")
 	fi
 	for mod_src in ${sources_list}; do
-		echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
 	done
 }
 
@@ -89,13 +97,18 @@ src_prepare() {
 	XA_qa_check
 	XA_has_something_to_build
 
-	MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	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
-			for module_name in $(XA_get_module_name ${mod}); do
-				MODULE_NAMES+=" ${module_name}"
-			done
+			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
@@ -105,13 +118,11 @@ src_prepare() {
 	sed -e '/^all-local:/{s: modules::}' \
 		-e '/^install-exec-local:/{s: modules_install::}' \
 			-i extensions/Makefile.{in,am} || die
-	epatch "${FILESDIR}/${P}-ECHO-build.patch"
-	epatch "${FILESDIR}/${P}-RAWNAT-ipv6.patch"
-	epatch "${FILESDIR}/${P}-SYSRQ-ipv6.patch"
 }
 
 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}"
@@ -119,12 +130,12 @@ src_configure() {
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-	BUILD_TARGETS="modules" linux-mod_src_compile
+	use modules && BUILD_TARGETS="modules" linux-mod_src_compile
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	linux-mod_src_install
+	use modules && linux-mod_src_install
 	dodoc README doc/* || die
 	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+'
 }