libnetfilter_conntrack: bump to version 1.0.5
PATCH 1/2 libnetfilter_conntrack: bump to version 1.0.5
Patches upstream so drop them along with autoreconf.
--- package/libnetfilter_conntrack/0001-uclinux.patch | 26 --------------------- .../0002-src-Makefile.am-drop-hardcoded-ldl.patch | 27 ---------------------- .../libnetfilter_conntrack.hash | 6 ++--- .../libnetfilter_conntrack.mk | 4 +--- 4 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 package/libnetfilter_conntrack/0001-uclinux.patch delete mode 100644 package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patch
package/libnetfilter_conntrack/0001-uclinux.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From bdf4afdcb68f62fcd05536b8cb68478d3ea31c68 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Tue, 10 Sep 2013 15:46:19 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 12e1d16..1edfd66 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 -
package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From b8d32eff8dbfff5a93b6ea6ee9f5747e16cb32c4 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Wed, 14 Jan 2015 10:53:20 -0300 -Subject: [PATCH] src/Makefile.am: drop hardcoded -ldl - -This breaks static builds where the toolchain completely lacks libdl. - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 7d6c905..374598a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,6 +11,6 @@ lib_LTLIBRARIES = libnetfilter_conntrack.la - libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ - expect/libnfexpect.la \ - ${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS} --libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -+libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ - -version-info $(LIBVERSION) - libnetfilter_conntrack_la_SOURCES = main.c callback.c --- -2.0.5 -
package/libnetfilter_conntrack/libnetfilter_conntrack.hash +3 -3
@@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.tar.bz2.{md5sum,sha1sum} -md5 18cf80c4b339a3285e78822dbd4f08d7 libnetfilter_conntrack-1.0.4.tar.bz2 -sha1 34fae1a30cbd51d46945e9f35790118c3462b0c6 libnetfilter_conntrack-1.0.4.tar.bz2 +# 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
package/libnetfilter_conntrack/libnetfilter_conntrack.mk +1 -3
@@ -4,13 +4,11 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.4 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.5 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 LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl -# For 0001-uclinux.patch & 0002-src-Makefile.am-drop-hardcoded-ldl.patch -LIBNETFILTER_CONNTRACK_AUTORECONF = YES LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+ LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
Signature · 1 line
2.4.6
PATCH 2/2 conntrack-tools: bump to version 1.4.3
--- package/conntrack-tools/conntrack-tools.hash | 6 +++--- package/conntrack-tools/conntrack-tools.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
package/conntrack-tools/conntrack-tools.hash +3 -3
@@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.2.tar.bz2.{md5sum,sha1sum} -md5 b1f9d006e7bf000a77395ff7cd3fac16 conntrack-tools-1.4.2.tar.bz2 -sha1 50b89305bb689973d42a163c480dc77a5c0f6fe0 conntrack-tools-1.4.2.tar.bz2 +# 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
package/conntrack-tools/conntrack-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.2 +CONNTRACK_TOOLS_VERSION = 1.4.3 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 \
Signature · 1 line
2.4.6
PATCH 2/2 conntrack-tools: bump to version 1.4.3
Dear Gustavo Zacarias,
Quoted 1 line · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
Build test for MIPS architecture.
$ grep ^CONNTRACK_TOOLS_VERSION package/conntrack-tools/conntrack-tools.mk CONNTRACK_TOOLS_VERSION = 1.4.3
$ file output/target/usr/sbin/conntrack output/target/usr/sbin/conntrack: ELF 32-bit MSB executable, MIPS, MIPS32 rel2 version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.32, with unknown capability 0x41000000 = 0xf676e75, with unknown capability 0x10000 = 0x70403, stripped
Regards,
Vincent.
Quoted 30 lines
--- package/conntrack-tools/conntrack-tools.hash | 6 +++--- package/conntrack-tools/conntrack-tools.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/conntrack-tools/conntrack-tools.hash +3
-3@@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.2.tar.bz2.{md5sum,sha1sum} -md5 b1f9d006e7bf000a77395ff7cd3fac16 conntrack-tools-1.4.2.tar.bz2 -sha1 50b89305bb689973d42a163c480dc77a5c0f6fe0 conntrack-tools-1.4.2.tar.bz2 +# 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.bz2package/conntrack-tools/conntrack-tools.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.2 +CONNTRACK_TOOLS_VERSION = 1.4.3 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 \
PATCH 1/2 libnetfilter_conntrack: bump to version 1.0.5
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 3 lines · Gustavo Zacarias
Patches upstream so drop them along with autoreconf.
Signed-off-by Gustavo Zacarias <[email protected]>
Build test for MIPS architecture.
$ grep ^LIBNETFILTER_CONNTRACK_VERSION package/libnetfilter_conntrack/libnetfilter_conntrack.mk LIBNETFILTER_CONNTRACK_VERSION = 1.0.5
$ file output/target/usr/lib/libnetfilter_conntrack.so.3.5.0 output/target/usr/lib/libnetfilter_conntrack.so.3.5.0: ELF 32-bit MSB shared object, MIPS, MIPS32 rel2 version 1 (SYSV), dynamically linked, with unknown capability 0x41000000 = 0xf676e75, with unknown capability 0x10000 = 0x70403, stripped
Regards,
Vincent.
Quoted 105 lines
--- package/libnetfilter_conntrack/0001-uclinux.patch | 26 --------------------- .../0002-src-Makefile.am-drop-hardcoded-ldl.patch | 27 ---------------------- .../libnetfilter_conntrack.hash | 6 ++--- .../libnetfilter_conntrack.mk | 4 +--- 4 files changed, 4 insertions(+), 59 deletions(-)delete mode 100644
package/libnetfilter_conntrack/0001-uclinux.patch
delete mode 100644package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patchpackage/libnetfilter_conntrack/0001-uclinux.patch deleted +0
-26@@ -1,26 +0,0 @@ -From bdf4afdcb68f62fcd05536b8cb68478d3ea31c68 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Tue, 10 Sep 2013 15:46:19 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 12e1d16..1edfd66 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 -package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patch deleted +0
-27@@ -1,27 +0,0 @@ -From b8d32eff8dbfff5a93b6ea6ee9f5747e16cb32c4 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Wed, 14 Jan 2015 10:53:20 -0300 -Subject: [PATCH] src/Makefile.am: drop hardcoded -ldl - -This breaks static builds where the toolchain completely lacks libdl. - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 7d6c905..374598a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,6 +11,6 @@ lib_LTLIBRARIES = libnetfilter_conntrack.la - libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ - expect/libnfexpect.la \ - ${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS} --libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -+libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ - -version-info $(LIBVERSION) - libnetfilter_conntrack_la_SOURCES = main.c callback.c --- -2.0.5 -package/libnetfilter_conntrack/libnetfilter_conntrack.hash +3
-3@@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.tar.bz2.{md5sum,sha1sum} -md5 18cf80c4b339a3285e78822dbd4f08d7 libnetfilter_conntrack-1.0.4.tar.bz2 -sha1 34fae1a30cbd51d46945e9f35790118c3462b0c6 libnetfilter_conntrack-1.0.4.tar.bz2 +# 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.bz2package/libnetfilter_conntrack/libnetfilter_conntrack.mk +1
-3@@ -4,13 +4,11 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.4 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.5 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 LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl -# For 0001-uclinux.patch & 0002-src-Makefile.am-drop-hardcoded-ldl.patch -LIBNETFILTER_CONNTRACK_AUTORECONF = YES LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+ LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
PATCH 1/2 libnetfilter_conntrack: bump to version 1.0.5
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 11 lines · Gustavo Zacarias
Patches upstream so drop them along with autoreconf.
Signed-off-by Gustavo Zacarias <[email protected]>--- package/libnetfilter_conntrack/0001-uclinux.patch | 26 --------------------- .../0002-src-Makefile.am-drop-hardcoded-ldl.patch | 27 ---------------------- .../libnetfilter_conntrack.hash | 6 ++--- .../libnetfilter_conntrack.mk | 4 +--- 4 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 package/libnetfilter_conntrack/0001-uclinux.patch delete mode 100644 package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patch
Both applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com