net-firewall/xtables-addons: fix ECHO build failure. Rename xtables_mods to xtables_addons. Commit missed parts.

svn path=/; revision=402

3 files changed, 52 insertions, 6 deletions

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index cb16151..52036cf 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,2 +1,3 @@
+AUX xtables-addons-1.22-ECHO-build.patch 1638 RMD160 71a4bbea5fe9d4a552926cd8cf23d3d1a4dd8478 SHA1 68895480994b71b2cb13fd40cacf390346d95c1b SHA256 b353abecbd9f4e1f0393dea9081b98066541daf154b4a7d1e4f3d51434d2598f
 DIST xtables-addons-1.22.tar.bz2 366217 RMD160 f54696fb050eaf6061e48df142c72d0c8aa2626c SHA1 ff42aacb6b8fa5f6e204982bacab209f48a89bd4 SHA256 32916dee3da608b554d71e89a9cba74d2078d2be78684ccb6184b2afc8688719
-EBUILD xtables-addons-1.22.ebuild 3764 RMD160 1ac9843363a52661619ba89623d60777242bd6dd SHA1 5795c0dd76ccfd3c31b3b0c323f7d7218bed6e84 SHA256 bf15c5926aa20c7ad11af3d10bf9ddcf4db6830cb59b6a33a9ce9a5c5c089c5f
+EBUILD xtables-addons-1.22.ebuild 3818 RMD160 a6036f9b5b8f20ab01556528a58489056121d681 SHA1 218b7c4ac03b6aee7be1fac96fc83e77628ab821 SHA256 d1059d2fe349daf1c6462d17378edec2e3c970c1c3434d043f0c1694470ae502
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
new file mode 100644
index 0000000..8b42ca6
--- /dev/null
+++ b/net-firewall/xtables-addons/files/xtables-addons-1.22-ECHO-build.patch
@@ -0,0 +1,44 @@
+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/xtables-addons-1.22.ebuild b/net-firewall/xtables-addons/xtables-addons-1.22.ebuild
index 6796a27..1300fd3 100644
--- a/net-firewall/xtables-addons/xtables-addons-1.22.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-1.22.ebuild
@@ -22,13 +22,13 @@ 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_mods_${mod}"
+	IUSE="${IUSE} xtables_addons_${mod}"
 done
 
 RDEPEND="virtual/modutils
 	>=net-firewall/iptables-1.4.3
 	>virtual/linux-sources-2.6.22
-	xtables_mods_ipset? ( !net-firewall/ipset )"
+	xtables_addons_ipset? ( !net-firewall/ipset )"
 
 DEPEND="${RDEPEND}"
 
@@ -39,7 +39,7 @@ pkg_setup()	{
 	CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK"
 	# Some modules require IPV6
 	for mod in sysrq rawnat; do
-		use xtables_mods_${mod} && CONFIG_CHECK+=" IPV6"
+		use xtables_addons_${mod} && CONFIG_CHECK+=" IPV6"
 	done
 	linux-mod_pkg_setup
 }
@@ -58,7 +58,7 @@ XA_qa_check() {
 # Is there any use flag set? 
 XA_has_something_to_build() {
 	for mod in ${MODULES}; do
-		use xtables_mods_${mod} && return
+		use xtables_addons_${mod} && return
 	done
 
 	eerror "All modules are disabled. What do you want me to build?"
@@ -95,7 +95,7 @@ src_prepare() {
 
 	MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
 	for mod in ${MODULES}; do
-		if use xtables_mods_${mod}; then
+		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}"
@@ -109,6 +109,7 @@ 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"
 }
 
 src_configure() {