Patchwork iptables: upgrade to 1.4.19.1

login
register
mail settings
Submitter Cristian Iorga
Date June 5, 2013, 12:47 p.m.
Message ID <1370436435-3822-1-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/51173/
State Accepted
Commit d3e982a6c49e1df631b6326710b216f23dca221c
Headers show

Comments

Cristian Iorga - June 5, 2013, 12:47 p.m.
fix-iptables-extensions-build-error.patch no longer needed.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../fix-iptables-extensions-build-error.patch      |   44 --------------------
 .../{iptables_1.4.18.bb => iptables_1.4.19.1.bb}   |    5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
 rename meta/recipes-extended/iptables/{iptables_1.4.18.bb => iptables_1.4.19.1.bb} (90%)

Patch

diff --git a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch b/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
deleted file mode 100644
index 4cd919d..0000000
--- a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
+++ /dev/null
@@ -1,44 +0,0 @@ 
-From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001
-From: Cristian Iorga <cristian.iorga@intel.com>
-Date: Wed, 16 Jan 2013 20:14:43 +0200
-Subject: [PATCH] extensions: fix iptables extensions build error            
- in cross-compilation environments
-
-libtool is properly declared and used for cross-platform
-build environments
-
-Upstream-Status: Pending
-
-Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
----
- extensions/GNUmakefile.in |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index adad4d6..befb1fb 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -13,6 +13,7 @@ xtlibdir     = @xtlibdir@
- 
- CC                 = @CC@
- CCLD               = ${CC}
-+LIBTOOL            = @LIBTOOL@
- CFLAGS             = @CFLAGS@
- CPPFLAGS           = @CPPFLAGS@
- LDFLAGS            = @LDFLAGS@
-@@ -94,10 +95,10 @@ lib%.so: lib%.la
- 	${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
- 
- lib%.la: lib%.lo
--	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
-+	${AM_VERBOSE_CCLD} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
- 
- lib%.lo: ${srcdir}/lib%.c
--	${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
-+	${AM_VERBOSE_CC} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
- 
- libxt_NOTRACK.so: libxt_CT.so
- 	${AM_VERBOSE_GEN} ln -fs $< $@
--- 
-1.7.10.4
-
diff --git a/meta/recipes-extended/iptables/iptables_1.4.18.bb b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb
similarity index 90%
rename from meta/recipes-extended/iptables/iptables_1.4.18.bb
rename to meta/recipes-extended/iptables/iptables_1.4.19.1.bb
index bb8718f..a98ad4c 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.18.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb
@@ -21,12 +21,11 @@  FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
            file://types.h-add-defines-that-are-required-for-if_packet.patch \
-           file://fix-iptables-extensions-build-error.patch \
            file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
           "
 
-SRC_URI[md5sum] = "a819199d5ec013b82da13a8ffbba857e"
-SRC_URI[sha256sum] = "14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c"
+SRC_URI[md5sum] = "be97ce9007fa42c867901b496c935a0a"
+SRC_URI[sha256sum] = "dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2"
 
 inherit autotools