Patchwork [06/18] iptables: upgrade to 1.4.12.2

login
register
mail settings
Submitter Shane Wang
Date Jan. 22, 2012, 6:06 p.m.
Message ID <5da104c33636cbe2d512779de0799f78edbedd37.1327255445.git.shane.wang@intel.com>
Download mbox | patch
Permalink /patch/19947/
State New
Headers show

Comments

Shane Wang - Jan. 22, 2012, 6:06 p.m.
This patch is to upgrade iptables to 1.4.12.2, and introduce a patch not to check unknown symbols.
Otherwise, when it is compiled, it will report "libxtables.so.7" from LD_PRELOAD cannot be preloaded.

Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 .../iptables/iptables/GNUmakefile.patch            |   18 ++++++++++++++++++
 .../{iptables_1.4.12.1.bb => iptables_1.4.12.2.bb} |    7 ++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/iptables/iptables/GNUmakefile.patch
 rename meta/recipes-extended/iptables/{iptables_1.4.12.1.bb => iptables_1.4.12.2.bb} (88%)
Khem Raj - Jan. 22, 2012, 8:29 p.m.
On (23/01/12 02:06), Shane Wang wrote:
> This patch is to upgrade iptables to 1.4.12.2, and introduce a patch not to check unknown symbols.
> Otherwise, when it is compiled, it will report "libxtables.so.7" from LD_PRELOAD cannot be preloaded.

you should say dont build 'check' target by default or something on
those lines

> 
> Signed-off-by: Shane Wang <shane.wang@intel.com>
> ---
>  .../iptables/iptables/GNUmakefile.patch            |   18 ++++++++++++++++++
>  .../{iptables_1.4.12.1.bb => iptables_1.4.12.2.bb} |    7 ++++---
>  2 files changed, 22 insertions(+), 3 deletions(-)
>  create mode 100644 meta/recipes-extended/iptables/iptables/GNUmakefile.patch
>  rename meta/recipes-extended/iptables/{iptables_1.4.12.1.bb => iptables_1.4.12.2.bb} (88%)
> 
> diff --git a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
> new file mode 100644
> index 0000000..c60e84f
> --- /dev/null
> +++ b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
> @@ -0,0 +1,18 @@
> +Don't check unknown symbols.
> +
> +Signed-off-by: Shane Wang <shane.wang@intel.com>
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +diff -r abb89394ce0c extensions/GNUmakefile.in
> +--- a/extensions/GNUmakefile.in	Mon Jan 23 00:12:27 2012 +0800
> ++++ b/extensions/GNUmakefile.in	Mon Jan 23 00:38:32 2012 +0800
> +@@ -68,7 +68,7 @@
> + 
> + .PHONY: all install clean distclean FORCE
> + 
> +-all: ${targets} check
> ++all: ${targets}
> + 
> + check: ${targets}
> + 	@echo "  CHECK    unknown symbols in .so files"; \
> diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb
> similarity index 88%
> rename from meta/recipes-extended/iptables/iptables_1.4.12.1.bb
> rename to meta/recipes-extended/iptables/iptables_1.4.12.2.bb
> index 52aa4d5..2d3d311 100644
> --- a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
> +++ b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb
> @@ -21,10 +21,11 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \
>  FILES_${PN} =+ "${libdir}/xtables/"
>  FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
>  
> -SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
> +SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
> +           file://GNUmakefile.patch"
>  
> -SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43"
> -SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba"
> +SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c"
> +SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13"
>  
>  inherit autotools
>  
> -- 
> 1.7.6
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Shane Wang - Feb. 1, 2012, 2:58 p.m.
Khem Raj wrote onĀ 2012-01-23:

> On (23/01/12 02:06), Shane Wang wrote:
>> This patch is to upgrade iptables to 1.4.12.2, and introduce a patch
>> not to check unknown symbols. Otherwise, when it is compiled, it will
>> report "libxtables.so.7" from
> LD_PRELOAD cannot be preloaded.
> 
> you should say dont build 'check' target by default or something on
> those lines

I got you. Thank you, Raj.

--
Shane

Patch

diff --git a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
new file mode 100644
index 0000000..c60e84f
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
@@ -0,0 +1,18 @@ 
+Don't check unknown symbols.
+
+Signed-off-by: Shane Wang <shane.wang@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -r abb89394ce0c extensions/GNUmakefile.in
+--- a/extensions/GNUmakefile.in	Mon Jan 23 00:12:27 2012 +0800
++++ b/extensions/GNUmakefile.in	Mon Jan 23 00:38:32 2012 +0800
+@@ -68,7 +68,7 @@
+ 
+ .PHONY: all install clean distclean FORCE
+ 
+-all: ${targets} check
++all: ${targets}
+ 
+ check: ${targets}
+ 	@echo "  CHECK    unknown symbols in .so files"; \
diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb
similarity index 88%
rename from meta/recipes-extended/iptables/iptables_1.4.12.1.bb
rename to meta/recipes-extended/iptables/iptables_1.4.12.2.bb
index 52aa4d5..2d3d311 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.12.1.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb
@@ -21,10 +21,11 @@  RRECOMMENDS_${PN} = "kernel-module-x-tables \
 FILES_${PN} =+ "${libdir}/xtables/"
 FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
-SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
+SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
+           file://GNUmakefile.patch"
 
-SRC_URI[md5sum] = "b08a1195ec2c1ebeaf072db3c55fdf43"
-SRC_URI[sha256sum] = "77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba"
+SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c"
+SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13"
 
 inherit autotools