Added patch to fix compilation with iptables 1.4.9

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

4 files changed, 51 insertions, 4 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index ba7b2fec6ec0..f9e01f0d57ba 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/connman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.16 2010/08/16 12:42:55 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.17 2010/08/20 08:07:53 dagger Exp $
+
+*connman-0.57-r1 (20 Aug 2010)
+
+  20 Aug 2010; Robert Piasek <dagger@gentoo.org> -connman-0.57.ebuild,
+  +connman-0.57-r1.ebuild, +files/connman-0.57-fix-iptables-test.patch:
+  This patch fixes test/iptables to compile with iptables 1.4.9 and newer
 
 *connman-0.57 (16 Aug 2010)
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index fb23f6c0597d..3b0ad6c7226d 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,8 +1,9 @@
+AUX connman-0.57-fix-iptables-test.patch 1197 RMD160 ed85ca23d23091089942912a1ec742c04f613a91 SHA1 369fdbe42c98e100843843fe956247785f07cbf3 SHA256 e4a9ad7b9b1a34f9184da24fd6476022c19c26ae2b249c5be3ec41a03b2c5d2c
 AUX connman.confd 736 RMD160 39d3ca8e40a0759ad2b2ce1612e647a5affef809 SHA1 b2b6b4648587e01683e82864c1bee74f828f820b SHA256 2094ece185cfda54f899075c2d82ae3ded896b602cdf4e00da224f9b52af23d8
 AUX connman.initd 578 RMD160 5648875b3ff9f94f13725e16189a4cfee4faa475 SHA1 efd731b8771d97435d1740941363e1fbc7e7bf3d SHA256 10deff4d07f2a631ef7d797ed420a917c00312381ee69f60346e94cf9a3fa25a
 DIST connman-0.55.tar.gz 535140 RMD160 537151c4eb9eaa848e6f1ab971f941b61290dff0 SHA1 74a5f2b116dc183e23732538fc5ff8f4b6de2c0f SHA256 7afce91783291b201c96bea8835e02dac25b0489f599d1b1243d80c23f1183ca
 DIST connman-0.57.tar.gz 546764 RMD160 434e3f12dfcfe7912bd5d008decb997bc95a4f4d SHA1 e35af391dd19d6ed0166ba51fbd907d75d7a6ff2 SHA256 023add5421e627015a89ad7707ca9429e2be09b43c6c5f00a5455e19523757b6
 EBUILD connman-0.55.ebuild 2090 RMD160 5092c59336ddf7f3f230d390968880b9453277b0 SHA1 b5f39c444948f3258f7ba21eacb55ed6dd33fa57 SHA256 1e8ae48d39e38f87aa36253207ac78ea57df654b7bd607f14bf5b66bf5760290
-EBUILD connman-0.57.ebuild 2090 RMD160 5092c59336ddf7f3f230d390968880b9453277b0 SHA1 b5f39c444948f3258f7ba21eacb55ed6dd33fa57 SHA256 1e8ae48d39e38f87aa36253207ac78ea57df654b7bd607f14bf5b66bf5760290
-MISC ChangeLog 3089 RMD160 9a1523390535c765c224db007066f211def7fb2d SHA1 305e4ed37eef407132ea10252f1fe734f5be0c48 SHA256 e43683dea9a765bdaca9fa062eedbec995e42faa38bfc3f40a979c67427ad0a9
+EBUILD connman-0.57-r1.ebuild 2167 RMD160 41955098a0849101b5b60ae9f8ada65228a25362 SHA1 6f719ff4acb199019835f3c879c21c57a756569d SHA256 749e90b777b28e0184a7242fbfaada7b69725e8afc14cd6e759c1df4ea1c8764
+MISC ChangeLog 3339 RMD160 81423cc6794729591a8ff82becb2e4b48fcbbb38 SHA1 91282d1ab570b94b4d8bf91ad587c2f66a938c09 SHA256 054848362ad52800313d7f15331ccc5434f3eb4db896034544861a621c3ea321
 MISC metadata.xml 932 RMD160 21f4243e1c81e50ba673de04d85630df08b5626d SHA1 9f7e066944638c4430c52a1afb50bbac18aff6d9 SHA256 af10d813f2b0e3a1df1ceba382fba379984ee16d8e98f8f6870560e3f5617a58
diff --git a/net-misc/connman/connman-0.57.ebuild b/net-misc/connman/connman-0.57-r1.ebuild
index 4f86d951ba36..5b2cd9db42f7 100644
--- a/net-misc/connman/connman-0.57.ebuild
+++ b/net-misc/connman/connman-0.57-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -31,6 +31,10 @@ RDEPEND=">=dev-libs/glib-2.16
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-iptables-test.patch"
+}
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
diff --git a/net-misc/connman/files/connman-0.57-fix-iptables-test.patch b/net-misc/connman/files/connman-0.57-fix-iptables-test.patch
new file mode 100644
index 000000000000..b3dd5d32f389
--- /dev/null
+++ b/net-misc/connman/files/connman-0.57-fix-iptables-test.patch
@@ -0,0 +1,36 @@
+From f9745d978e6797c4576b52f602325db02dc48403 Mon Sep 17 00:00:00 2001
+From: Robert Piasek <dagger@gentoo.org>
+Date: Thu, 19 Aug 2010 16:33:59 +0100
+Subject: [PATCH] fix iptables-test to work with iptables 1.4.9
+
+Starting with version 1.4.9 iptables dropped xtables_set_revision
+function. This patch removes any use of it.
+---
+ tools/iptables-test.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/iptables-test.c b/tools/iptables-test.c
+index 1f3235c..b97c520 100644
+--- a/tools/iptables-test.c
++++ b/tools/iptables-test.c
+@@ -110,7 +110,7 @@ static struct ipt_entry *build_quota_drop_entry(void)
+ 		return NULL;
+ 	m->m->u.match_size = match_size;
+ 	strcpy(m->m->u.user.name, m->name);
+-	xtables_set_revision(m->m->u.user.name, m->revision);
++	m->m->u.user.revision = m->revision;
+ 	if (m->init != NULL)
+ 		m->init(m->m);
+ 
+@@ -125,7 +125,7 @@ static struct ipt_entry *build_quota_drop_entry(void)
+ 	t->t = xtables_calloc(1, target_size);
+ 	t->t->u.target_size = target_size;
+ 	strcpy(t->t->u.user.name, "DROP");
+-	xtables_set_revision(t->t->u.user.name, t->revision);
++	t->t->u.user.revision = t->revision;
+ 	if (t->init != NULL)
+ 		t->init(t->t);
+ 
+-- 
+1.7.2
+