libnetfilter-conntrack: Upgrade to 1.0.6

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

2 files changed, 2 insertions, 92 deletions

diff --git a/meta-networking/recipes-filter/libnetfilter/files/replace-VLAs-in-union.patch b/meta-networking/recipes-filter/libnetfilter/files/replace-VLAs-in-union.patch
deleted file mode 100644
index 16e4af405..000000000
--- a/meta-networking/recipes-filter/libnetfilter/files/replace-VLAs-in-union.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-VLAs in structs and unions (non-PODs) is unsupported in non-gcc compilers
-therefore convert it to not use VLAs instead use fixed arrays
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: libnetfilter_conntrack-1.0.4/src/conntrack/api.c
-===================================================================
---- libnetfilter_conntrack-1.0.4.orig/src/conntrack/api.c
-+++ libnetfilter_conntrack-1.0.4/src/conntrack/api.c
-@@ -954,16 +954,15 @@ int nfct_query(struct nfct_handle *h,
-               const enum nf_conntrack_query qt,
-               const void *data)
- {
--       size_t size = 4096;     /* enough for now */
-        union {
--               char buffer[size];
-+               char buffer[4096];
-                struct nfnlhdr req;
-        } u;
- 
-        assert(h != NULL);
-        assert(data != NULL);
- 
--       if (__build_query_ct(h->nfnlssh_ct, qt, data, &u.req, size) == -1)
-+       if (__build_query_ct(h->nfnlssh_ct, qt, data, &u.req, 4096) == -1)
-                return -1;
- 
-        return nfnl_query(h->nfnlh, &u.req.nlh);
-@@ -986,16 +985,15 @@ int nfct_send(struct nfct_handle *h,
-              const enum nf_conntrack_query qt,
-              const void *data)
- {
--       size_t size = 4096;     /* enough for now */
-        union {
--               char buffer[size];
-+               char buffer[4096];
-                struct nfnlhdr req;
-        } u;
- 
-        assert(h != NULL);
-        assert(data != NULL);
- 
--       if (__build_query_ct(h->nfnlssh_ct, qt, data, &u.req, size) == -1)
-+       if (__build_query_ct(h->nfnlssh_ct, qt, data, &u.req, 4096) == -1)
-                return -1;
- 
-        return nfnl_send(h->nfnlh, &u.req.nlh);
-Index: libnetfilter_conntrack-1.0.4/src/expect/api.c
-===================================================================
---- libnetfilter_conntrack-1.0.4.orig/src/expect/api.c
-+++ libnetfilter_conntrack-1.0.4/src/expect/api.c
-@@ -669,16 +669,15 @@ int nfexp_query(struct nfct_handle *h,
-                const enum nf_conntrack_query qt,
-                const void *data)
- {
--       size_t size = 4096;     /* enough for now */
-        union {
--               char buffer[size];
-+               char buffer[4096];
-                struct nfnlhdr req;
-        } u;
- 
-        assert(h != NULL);
-        assert(data != NULL);
- 
--       if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, size) == -1)
-+       if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, 4096) == -1)
-                return -1;
- 
-        return nfnl_query(h->nfnlh, &u.req.nlh);
-@@ -701,16 +700,15 @@ int nfexp_send(struct nfct_handle *h,
-               const enum nf_conntrack_query qt,
-               const void *data)
- {
--       size_t size = 4096;     /* enough for now */
-        union {
--               char buffer[size];
-+               char buffer[4096];
-                struct nfnlhdr req;
-        } u;
- 
-        assert(h != NULL);
-        assert(data != NULL);
- 
--       if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, size) == -1)
-+       if (__build_query_exp(h->nfnlssh_exp, qt, data, &u.req, 4096) == -1)
-                return -1;
- 
-        return nfnl_send(h->nfnlh, &u.req.nlh);
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.4.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb
index ecbc86ba7..e4e186bdb 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.4.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 DEPENDS = "libnfnetlink libmnl"
 
 SRC_URI = "http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2;name=tar \
-           file://replace-VLAs-in-union.patch \
 "
-SRC_URI[tar.md5sum] = "18cf80c4b339a3285e78822dbd4f08d7"
-SRC_URI[tar.sha256sum] = "d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d"
+SRC_URI[tar.md5sum] = "7139c5f408dd9606ffecfd5dcda8175b"
+SRC_URI[tar.sha256sum] = "efcc08021284e75f4d96d3581c5155a11f08fd63316b1938cbcb269c87f37feb"
 
 S = "${WORKDIR}/libnetfilter_conntrack-${PV}"