iptables: recipe upgrade

GIT PULL New Dongxiao Xu 2 participants 4 messages Nov 1, 2011

lore

Share & tools

lore

Dongxiao Xu

author

2011-11-01 03:30 UTC #0 lore raw

Hi Richard and Saul,

This is the second pull request for iptables and connman, please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 4ce1f57e723cb6ccfd67ed1570228602547bd112:

distro_tracking: polkit, libsndfile, etc (2011-10-31 23:03:11 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/upgrade
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgrade

Dongxiao Xu (2):
iptables: upgrade to version 1.4.12.1
connman: add xtables_version to fix xtables API change

 .../connman/connman-0.75/xtables_version.patch     |   64 ++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_0.75.bb  |    3 +-
 .../{iptables_1.4.9.bb => iptables_1.4.12.1.bb}    |   16 +++--
 3 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch
 rename meta/recipes-extended/iptables/{iptables_1.4.9.bb => iptables_1.4.12.1.bb} (64%)

Dongxiao Xu

author

2011-11-01 03:30 UTC #1 lore raw

PATCH 1/2 iptables: upgrade to version 1.4.12.1

Change do_configure_prepend() since some m4 file is needed when doing configuration.

Define correct FILE for iptables and iptables-dbg packages.

License checksum changed (not essential part), and the license is still GPLv2.

Signed-off-by Dongxiao Xu <[email protected]>

---
 .../{iptables_1.4.9.bb => iptables_1.4.12.1.bb}    |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
 rename meta/recipes-extended/iptables/{iptables_1.4.9.bb => iptables_1.4.12.1.bb} (64%)

meta/recipes-extended/iptables/iptables_1.4.12.1.bb renamed from meta/recipes-extended/iptables/iptables_1.4.9.bb +9 -7

similarity index 64%
rename from meta/recipes-extended/iptables/iptables_1.4.9.bb
rename to meta/recipes-extended/iptables/iptables_1.4.12.1.bb
index 7c9fbea..52aa4d5 100644
@@ -4,8 +4,8 @@ filtering code in Linux."
 HOMEPAGE = "http://www.netfilter.org/"
 BUGTRACKER = "http://bugzilla.netfilter.org/"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
-                    file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
+                    file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
 
 PR = "r0"

@@ -18,12 +18,13 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \
                      kernel-module-nf-conntrack-ipv4 \
                      kernel-module-nf-nat \
                      kernel-module-ipt-masquerade"
-FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug"
+FILES_${PN} =+ "${libdir}/xtables/"
+FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "db1312f7ce5a4c11dc981a2ac76b26e8"
-SRC_URI[sha256sum] = "1ac719d6265cf64220c80c0974ed9d35febdac2986bb96eeaa9c8c7959a1d306"
+SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43"
+SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba"
 
 inherit autotools

@@ -31,6 +32,7 @@ EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
                 ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
 
 do_configure_prepend() {
-	# they are all libtool m4 files
-	rm -rf ${S}/m4
+	# Remove some libtool m4 files
+	# Keep ax_check_linker_flags.m4 which belongs to autoconf-archive.
+	rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4
 }

Signature · 1 line

1.7.1

Dongxiao Xu

author

2011-11-01 03:30 UTC #2 lore raw

PATCH 2/2 connman: add xtables_version to fix xtables API change

In reply to Dongxiao Xu

After upgrade iptables to a newer version, some of its API are changed. Therefore we add related fixes to the current connman.

Currently we don't upgrade connman since kernel.org still doesn't work and we could not fetch the newer sources.

Signed-off-by Dongxiao Xu <[email protected]>

---
 .../connman/connman-0.75/xtables_version.patch     |   64 ++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_0.75.bb  |    3 +-
 2 files changed, 66 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch

meta/recipes-connectivity/connman/connman-0.75/xtables_version.patch new file +64 -0

new file mode 100644
index 0000000..13e2c36
@@ -0,0 +1,64 @@
+xtables_merge_options API change, fix its calling in connman.
+
+Signed-off-by: Dongxiao Xu <[email protected]>
+
+Upstream-Status: Backport
+
+diff -ruN connman-0.75-orig//src/iptables.c connman-0.75/src/iptables.c
+--- connman-0.75-orig//src/iptables.c	2011-02-22 12:16:25.000000000 +0800
++++ connman-0.75/src/iptables.c	2011-10-26 09:21:33.941164000 +0800
+@@ -1089,7 +1089,11 @@
+ 			if (xt_t->init != NULL)
+ 				xt_t->init(xt_t->t);
+ 			iptables_globals.opts =
+-				xtables_merge_options(iptables_globals.opts,
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++                                                     iptables_globals.orig_opts,
++#endif
++                                                     iptables_globals.opts,
+ 						     xt_t->extra_opts,
+ 						     &xt_t->option_offset);
+ 			if (iptables_globals.opts == NULL)
+@@ -1113,7 +1117,11 @@
+ 				xt_m->init(xt_m->m);
+ 			if (xt_m != xt_m->next) {
+ 				iptables_globals.opts =
+-				xtables_merge_options(iptables_globals.opts,
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++                                                iptables_globals.orig_opts,
++#endif
++                                                iptables_globals.opts,
+ 						xt_m->extra_opts,
+ 						&xt_m->option_offset);
+ 				if (iptables_globals.opts == NULL)
+diff -ruN connman-0.75-orig//tools/iptables-test.c connman-0.75/tools/iptables-test.c
+--- connman-0.75-orig//tools/iptables-test.c	2011-02-22 12:16:25.000000000 +0800
++++ connman-0.75/tools/iptables-test.c	2011-10-26 09:23:25.701164000 +0800
+@@ -1076,7 +1076,11 @@
+ 			if (xt_t->init != NULL)
+ 				xt_t->init(xt_t->t);
+ 			connman_iptables_globals.opts =
+-				xtables_merge_options(connman_iptables_globals.opts,
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						     connman_iptables_globals.orig_opts,
++#endif
++						     connman_iptables_globals.opts,
+ 						     xt_t->extra_opts,
+ 						     &xt_t->option_offset);
+ 			if (connman_iptables_globals.opts == NULL)
+@@ -1102,7 +1106,11 @@
+ 				xt_m->init(xt_m->m);
+ 			if (xt_m != xt_m->next) {
+ 				connman_iptables_globals.opts =
+-					xtables_merge_options(connman_iptables_globals.opts,
++					xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						connman_iptables_globals.orig_opts,
++#endif
++						connman_iptables_globals.opts,
+ 						xt_m->extra_opts,
+ 						&xt_m->option_offset);
+ 				if (connman_iptables_globals.opts == NULL)

meta/recipes-connectivity/connman/connman_0.75.bb +2 -1

index 4c25fcc..8a02753 100644
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "\
   ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \

@@ -21,6 +21,7 @@ EXTRA_OECONF += "\
 SRC_URI  = "\
   ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \
   file://add_xuser_dbus_permission.patch \
+  file://xtables_version.patch \
   file://connman \
 "

Signature · 1 line

1.7.1

Richard Purdie

Applied

2011-11-01 11:12 UTC #3 lore raw

In reply to Dongxiao Xu

Quoted 11 lines · Dongxiao Xu

Hi Richard and Saul,
This is the second pull request for iptables and connman, please help to review and pull.
Thanks,
Dongxiao
The following changes since commit 4ce1f57e723cb6ccfd67ed1570228602547bd112:
distro_tracking: polkit, libsndfile, etc (2011-10-31 23:03:11 +0000)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/upgrade
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgrade
Dongxiao Xu (2):
iptables: upgrade to version 1.4.12.1
connman: add xtables_version to fix xtables API change

Merged to master, thanks.

Richard