* [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6
@ 2016-08-23 13:19 Gustavo Zacarias
2016-08-23 13:19 ` [Buildroot] [PATCH 2/2] conntrack-tools: bump to version 1.4.4 Gustavo Zacarias
2016-08-23 15:57 ` [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2016-08-23 13:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/libnetfilter_conntrack/libnetfilter_conntrack.hash | 6 +++---
package/libnetfilter_conntrack/libnetfilter_conntrack.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
index 67d1e40..de9d1d3 100644
--- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
+++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
@@ -1,3 +1,3 @@
-# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.tar.bz2.{md5sum,sha1sum}
-md5 6aa1bd3c1d0723235ac897087b4cd4e5 libnetfilter_conntrack-1.0.5.tar.bz2
-sha1 9aed8733d98af39d57fffd929c2bea70f1dcba06 libnetfilter_conntrack-1.0.5.tar.bz2
+# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.tar.bz2.{md5sum,sha1sum}
+md5 7139c5f408dd9606ffecfd5dcda8175b libnetfilter_conntrack-1.0.6.tar.bz2
+sha1 015f985a8e171889a67769ba02d070eca53bac07 libnetfilter_conntrack-1.0.6.tar.bz2
diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
index 33f1294..ec05f6d 100644
--- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.5
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.6
LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
--
2.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] conntrack-tools: bump to version 1.4.4
2016-08-23 13:19 [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Gustavo Zacarias
@ 2016-08-23 13:19 ` Gustavo Zacarias
2016-08-23 15:57 ` [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2016-08-23 13:19 UTC (permalink / raw)
To: buildroot
Drop usptream patch.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../0001-src-fix-build-with-musl-libc.patch | 37 ----------------------
package/conntrack-tools/conntrack-tools.hash | 6 ++--
package/conntrack-tools/conntrack-tools.mk | 2 +-
3 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch
diff --git a/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch b/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch
deleted file mode 100644
index 5881f98..0000000
--- a/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d7b20d9bbed23a7a7e40af2f5e78f37ff67e8d93 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Mon, 23 Nov 2015 02:12:48 -0200
-Subject: [PATCH] src: fix build with musl libc
-
-The GNU version of 'struct tcphdr' is not exposed by musl libc headers
-unless _GNU_SOURCE is defined. Without this definition, the build fails
-with:
-
- rpc.c: In function 'rpc_helper_cb':
- rpc.c:351:15: error: 'struct tcphdr' has no member named 'doff'
- offset += th->doff * 4;
- ^
-
-Upstream status: sent
-http://patchwork.ozlabs.org/patch/547376/
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- src/helpers/rpc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c
-index 82493c2..3a7b337 100644
---- a/src/helpers/rpc.c
-+++ b/src/helpers/rpc.c
-@@ -28,6 +28,7 @@
-
- #include <rpc/rpc_msg.h>
- #include <rpc/pmap_prot.h>
-+#define _GNU_SOURCE
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
-
---
-2.1.4
-
diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash
index 7ff1cf7..9d68177 100644
--- a/package/conntrack-tools/conntrack-tools.hash
+++ b/package/conntrack-tools/conntrack-tools.hash
@@ -1,3 +1,3 @@
-# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.3.tar.bz2.{md5sum,sha1sum}
-md5 966a5d8f846ddf5304bcd12685c0707f conntrack-tools-1.4.3.tar.bz2
-sha1 509db30f34b283f4a74a7e638ba0ca713d3fe98c conntrack-tools-1.4.3.tar.bz2
+# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.4.tar.bz2.{md5sum,sha1sum}
+md5 acd9e0b27cf16ae3092ba900e4d7560e conntrack-tools-1.4.4.tar.bz2
+sha1 25b36fb6832373ef899bade3b82adf5382b9a05b conntrack-tools-1.4.4.tar.bz2
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 7287587..b73aa7f 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CONNTRACK_TOOLS_VERSION = 1.4.3
+CONNTRACK_TOOLS_VERSION = 1.4.4
CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
--
2.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6
2016-08-23 13:19 [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Gustavo Zacarias
2016-08-23 13:19 ` [Buildroot] [PATCH 2/2] conntrack-tools: bump to version 1.4.4 Gustavo Zacarias
@ 2016-08-23 15:57 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2016-08-23 15:57 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 23 Aug 2016 10:19:08 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/libnetfilter_conntrack/libnetfilter_conntrack.hash | 6 +++---
> package/libnetfilter_conntrack/libnetfilter_conntrack.mk | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
Both applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-23 15:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-23 13:19 [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Gustavo Zacarias
2016-08-23 13:19 ` [Buildroot] [PATCH 2/2] conntrack-tools: bump to version 1.4.4 Gustavo Zacarias
2016-08-23 15:57 ` [Buildroot] [PATCH 1/2] libnetfilter_conntrack: bump to version 1.0.6 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.