package/ell: bump version to 0.38
PATCH 1/2 package/ell: bump version to 0.38
- remove 0001-build-Add-rawmemchr-to-missing.h.patch (upstream [1])
- remove 0002-ell-add-missing-include-in-dhcp-server.patch (upstream [2])
[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81
[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=6dfff19d4716ba216de1a3298ed0f667d7782810
--- ...001-build-Add-rawmemchr-to-missing.h.patch | 47 ------------------- ...l-add-missing-include-in-dhcp-server.patch | 26 ---------- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 4 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 package/ell/0001-build-Add-rawmemchr-to-missing.h.patch delete mode 100644 package/ell/0002-ell-add-missing-include-in-dhcp-server.patch
package/ell/0001-build-Add-rawmemchr-to-missing.h.patch deleted +0 -47
@@ -1,47 +0,0 @@ -From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001 -From: Denis Kenzior <[email protected]> -Date: Mon, 30 Nov 2020 13:00:11 -0600 -Subject: [PATCH] build: Add rawmemchr to missing.h - -For those systems (i.e. musl) that do not support this - -[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81] -Signed-off-by: Peter Seiderer <[email protected]> ---- - configure.ac | 1 + - ell/missing.h | 10 ++++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 1e5ead9..f34add1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan], - ]) - - AC_CHECK_FUNCS(explicit_bzero) -+AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_FUNC(signalfd, dummy=yes, - AC_MSG_ERROR(signalfd support is required)) -diff --git a/ell/missing.h b/ell/missing.h -index 6b9b0fd..2a3e647 100644 ---- a/ell/missing.h -+++ b/ell/missing.h -@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n) - #ifndef SO_BINDTOIFINDEX - #define SO_BINDTOIFINDEX 62 - #endif -+ -+#ifndef HAVE_RAWMEMCHR -+static inline void *rawmemchr(const void *s, int c) -+{ -+_Pragma("GCC diagnostic push") -+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") -+ return memchr(s, c, (size_t) -1); -+_Pragma("GCC diagnostic pop") -+} -+#endif --- -2.29.2 -
package/ell/0002-ell-add-missing-include-in-dhcp-server.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= <[email protected]> -Date: Mon, 30 Nov 2020 18:40:33 -0300 -Subject: [PATCH] ell: add missing include in dhcp-server. - -[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=6dfff19d4716ba216de1a3298ed0f667d7782810] -Signed-off-by: Peter Seiderer <[email protected]> ---- - ell/dhcp-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c -index c983ed4..144e83e 100644 ---- a/ell/dhcp-server.c -+++ b/ell/dhcp-server.c -@@ -24,6 +24,7 @@ - #include <config.h> - #endif - -+#include <linux/types.h> - #include <net/ethernet.h> - #include <sys/socket.h> - #include <arpa/inet.h> --- -2.29.2 -
package/ell/ell.hash +1 -1
@@ -1,5 +1,5 @@ # Locally computed -sha256 c2b3848568c75bcf5a0e7d1f2efce4fdb2733d28226ed21c6a6542f0be05d784 ell-0.35-br1.tar.gz +sha256 7767306f20db41c28b3138b5323bca05fef92238b6b61f81f66c2af684a13886 ell-0.38-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
package/ell/ell.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.35 +ELL_VERSION = 0.38 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git ELL_SITE_METHOD = git ELL_LICENSE = LGPL-2.1+
Signature · 1 line
2.30.1
PATCH 2/2 package/iwd: bump version to 1.12
- remove 0001-configure.ac-fix-static-build-with-readline.patch (upstream [1])
--- ...re.ac-fix-static-build-with-readline.patch | 61 ------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 package/iwd/0001-configure.ac-fix-static-build-with-readline.patch
package/iwd/0001-configure.ac-fix-static-build-with-readline.patch deleted +0 -61
@@ -1,61 +0,0 @@ -From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Wed, 16 Dec 2020 07:51:04 +0100 -Subject: [PATCH] configure.ac: fix static build with readline - -Retrieve the dependencies of readline through pkg-config (and fallback -to -lreadline) to avoid the following build failure: - -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr': -display.c:(.text+0x1ab): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: -https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/] ---- - Makefile.am | 4 ++-- - configure.ac | 3 +++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3cd7eaa6..493d06cc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \ - client/network.h client/network.c \ - client/properties.h client/properties.c \ - client/wsc.c client/station.c --client_iwctl_LDADD = $(ell_ldadd) -lreadline -+client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS) - - if MANUAL_PAGES - man_MANS += client/iwctl.1 -@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \ - client/display.h client/display.c \ - client/network.h client/network.c \ - client/properties.h client/properties.c --unit_test_client_LDADD = $(ell_ldadd) -lreadline -+unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS) - endif - - unit_test_sae_SOURCES = unit/test-sae.c \ -diff --git a/configure.ac b/configure.ac -index 7bd917a4..52f27ed9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], - if (test "${enable_client}" != "no"); then - AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, - AC_MSG_ERROR(readline header files are required)) -+ PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline) -+ AC_SUBST(READLINE_CFLAGS) -+ AC_SUBST(READLINE_LIBS) - fi - AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") - --- -2.29.2 -
package/iwd/iwd.hash +1 -1
@@ -1,5 +1,5 @@ # Locally computed -sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz +sha256 c0d827f446012cd14e63d174d52b69b0806ae23f0708933d50c57fea64af9c8a iwd-1.12-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
package/iwd/iwd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.10 +IWD_VERSION = 1.12 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+
Signature · 1 line
2.30.1
PATCH 2/2 package/iwd: bump version to 1.12
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- remove 0001-configure.ac-fix-static-build-with-readline.patch (upstream [1])
Signed-off-by Peter Seiderer <[email protected]>
Committed to next, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/ell: bump version to 0.38
In reply to Peter SeidererQuoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- remove 0001-build-Add-rawmemchr-to-missing.h.patch (upstream [1])
Quoted 7 lines
- remove 0002-ell-add-missing-include-in-dhcp-server.patch (upstream [2])
[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81
[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=6dfff19d4716ba216de1a3298ed0f667d7782810Signed-off-by Peter Seiderer <[email protected]>
Committed to next, thanks.
Signature · 1 line
Bye, Peter Korsgaard