Patchwork [CONSOLIDATED,PULL,10/19] iptables: upgrade to version 1.4.13

login
register
mail settings
Submitter Saul Wold
Date April 30, 2012, 10:20 p.m.
Message ID <5da3ede96713cf3bcd51ff633600fc26076f49cb.1335824356.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/26709/
State New
Headers show

Comments

Saul Wold - April 30, 2012, 10:20 p.m.
From: Dongxiao Xu <dongxiao.xu@intel.com>

Remove a patch since it is already in upstream.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 .../iptables/iptables/GNUmakefile.patch            |   18 ------------------
 .../{iptables_1.4.12.2.bb => iptables_1.4.13.bb}   |    5 ++---
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-extended/iptables/iptables/GNUmakefile.patch
 rename meta/recipes-extended/iptables/{iptables_1.4.12.2.bb => iptables_1.4.13.bb} (89%)

Patch

diff --git a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
deleted file mode 100644
index c60e84f..0000000
--- a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@ 
-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.2.bb b/meta/recipes-extended/iptables/iptables_1.4.13.bb
similarity index 89%
rename from meta/recipes-extended/iptables/iptables_1.4.12.2.bb
rename to meta/recipes-extended/iptables/iptables_1.4.13.bb
index 663ddad..59782c0 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.13.bb
@@ -22,11 +22,10 @@  FILES_${PN} =+ "${libdir}/xtables/"
 FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
-           file://GNUmakefile.patch \
            file://types.h-add-defines-that-are-required-for-if_packet.patch"
 
-SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c"
-SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13"
+SRC_URI[md5sum] = "40a15608ec57b50e9377cace546dd115"
+SRC_URI[sha256sum] = "321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded"
 
 inherit autotools