* [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 @ 2021-12-01 9:52 James Hilliard 2021-12-01 9:52 ` [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 James Hilliard 2021-12-01 20:36 ` [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 Peter Seiderer 0 siblings, 2 replies; 4+ messages in thread From: James Hilliard @ 2021-12-01 9:52 UTC (permalink / raw) To: buildroot; +Cc: James Hilliard, Peter Seiderer, Matt Weber Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 84016c0ce0..20b568dde4 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 41a6f8fa4d285b52cb7a5a87bda3e7370ecaac02d94aaa7ec1a23f0480b8bc3f ell-0.44.tar.xz +sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 47137e2530..4fad6e8d1b 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.44 +ELL_VERSION = 0.46 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 2021-12-01 9:52 [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 James Hilliard @ 2021-12-01 9:52 ` James Hilliard 2021-12-01 20:40 ` Peter Seiderer 2021-12-01 20:36 ` [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 Peter Seiderer 1 sibling, 1 reply; 4+ messages in thread From: James Hilliard @ 2021-12-01 9:52 UTC (permalink / raw) To: buildroot; +Cc: James Hilliard, Peter Seiderer, Matt Weber Drop patches that are now upstream Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- ...-build-Add-reallocarray-to-missing-h.patch | 55 ------------------- ...nfig-Remove-usage-of-in6_addr__in6_u.patch | 32 ----------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/iwd/0001-build-Add-reallocarray-to-missing-h.patch delete mode 100644 package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch diff --git a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch b/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch deleted file mode 100644 index ef6114f1af..0000000000 --- a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ec1c348b4fd67619fa0c2f55ae644f6a8014d971 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 19 Sep 2021 21:17:44 +0200 -Subject: build: Add reallocarray to missing.h - -reallocarray has been added to glibc relatively recently (version 2.26, -from 2017) and apparently not all users run new enough glibc. Moreover, -reallocarray is not available with uclibc-ng. So use realloc if -reallocarray is not available to avoid the following build failure -raised since commit 891b78e9e892a3bcd800eb3a298e6380e9a15dd1: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/sae.o: in function `sae_rx_authenticate': -sae.c:(.text+0xd74): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/c6d3f86282c44645b4f1c61882dc63ccfc8eb35a - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - configure.ac | 1 + - src/missing.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c6250401..51d9da93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", - - AC_CHECK_FUNCS(explicit_bzero) - AC_CHECK_FUNCS(rawmemchr) -+AC_CHECK_FUNCS(reallocarray) - - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) - -diff --git a/src/missing.h b/src/missing.h -index 2cc80aee..a5b92952 100644 ---- a/src/missing.h -+++ b/src/missing.h -@@ -37,3 +37,10 @@ _Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") - _Pragma("GCC diagnostic pop") - } - #endif -+ -+#ifndef HAVE_REALLOCARRAY -+static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) -+{ -+ return realloc(ptr, nmemb * size); -+} -+#endif --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch b/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch deleted file mode 100644 index f6b3d24516..0000000000 --- a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001 -From: Andrew Zaborowski <andrew.zaborowski@intel.com> -Date: Thu, 16 Sep 2021 01:58:29 +0200 -Subject: netconfig: Remove usage of in6_addr.__in6_u - -in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in -the headers shipped with musl libc for example. The POSIX compliant and -universal way of accessing it is in6_addr.s6_addr. - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - src/netconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/netconfig.c b/src/netconfig.c -index ce95db0b..421270c9 100644 ---- a/src/netconfig.c -+++ b/src/netconfig.c -@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) - struct in6_addr in6_addr; - char *addr_str = l_malloc(INET6_ADDRSTRLEN); - -- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); -+ memcpy(in6_addr.s6_addr, addr, 16); - - if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, - INET6_ADDRSTRLEN)))) { --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 7c010ed891..58224170e6 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55 iwd-1.18.tar.xz +sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 96bdc56e93..7b122811c5 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.18 +IWD_VERSION = 1.20 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 2021-12-01 9:52 ` [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 James Hilliard @ 2021-12-01 20:40 ` Peter Seiderer 0 siblings, 0 replies; 4+ messages in thread From: Peter Seiderer @ 2021-12-01 20:40 UTC (permalink / raw) To: James Hilliard; +Cc: Matt Weber, buildroot Hello James, thanks for the patch.... On Wed, 1 Dec 2021 02:52:25 -0700, James Hilliard <james.hilliard1@gmail.com> wrote: > Drop patches that are now upstream Same as for ell regarding master vs. next... Changelog is a nice to have, see [1] for example... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/?h=next&id=ff0d53405157ce82f6b56c74654c75c07b9ce92d > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > ...-build-Add-reallocarray-to-missing-h.patch | 55 ------------------- > ...nfig-Remove-usage-of-in6_addr__in6_u.patch | 32 ----------- > package/iwd/iwd.hash | 2 +- > package/iwd/iwd.mk | 2 +- > 4 files changed, 2 insertions(+), 89 deletions(-) > delete mode 100644 package/iwd/0001-build-Add-reallocarray-to-missing-h.patch > delete mode 100644 package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch > > diff --git a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch b/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch > deleted file mode 100644 > index ef6114f1af..0000000000 > --- a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch > +++ /dev/null > @@ -1,55 +0,0 @@ > -From ec1c348b4fd67619fa0c2f55ae644f6a8014d971 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Sun, 19 Sep 2021 21:17:44 +0200 > -Subject: build: Add reallocarray to missing.h > - > -reallocarray has been added to glibc relatively recently (version 2.26, > -from 2017) and apparently not all users run new enough glibc. Moreover, > -reallocarray is not available with uclibc-ng. So use realloc if > -reallocarray is not available to avoid the following build failure > -raised since commit 891b78e9e892a3bcd800eb3a298e6380e9a15dd1: > - > -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/sae.o: in function `sae_rx_authenticate': > -sae.c:(.text+0xd74): undefined reference to `reallocarray' > - > -Fixes: > - - http://autobuild.buildroot.org/results/c6d3f86282c44645b4f1c61882dc63ccfc8eb35a > - > -[Retrieved from: > -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971] > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > ---- > - configure.ac | 1 + > - src/missing.h | 7 +++++++ > - 2 files changed, 8 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index c6250401..51d9da93 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -129,6 +129,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", > - > - AC_CHECK_FUNCS(explicit_bzero) > - AC_CHECK_FUNCS(rawmemchr) > -+AC_CHECK_FUNCS(reallocarray) > - > - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) > - > -diff --git a/src/missing.h b/src/missing.h > -index 2cc80aee..a5b92952 100644 > ---- a/src/missing.h > -+++ b/src/missing.h > -@@ -37,3 +37,10 @@ _Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") > - _Pragma("GCC diagnostic pop") > - } > - #endif > -+ > -+#ifndef HAVE_REALLOCARRAY > -+static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) > -+{ > -+ return realloc(ptr, nmemb * size); > -+} > -+#endif > --- > -cgit 1.2.3-1.el7 > - > diff --git a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch b/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch > deleted file mode 100644 > index f6b3d24516..0000000000 > --- a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001 > -From: Andrew Zaborowski <andrew.zaborowski@intel.com> > -Date: Thu, 16 Sep 2021 01:58:29 +0200 > -Subject: netconfig: Remove usage of in6_addr.__in6_u > - > -in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in > -the headers shipped with musl libc for example. The POSIX compliant and > -universal way of accessing it is in6_addr.s6_addr. > - > -[Retrieved from: > -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7] > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > ---- > - src/netconfig.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/netconfig.c b/src/netconfig.c > -index ce95db0b..421270c9 100644 > ---- a/src/netconfig.c > -+++ b/src/netconfig.c > -@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) > - struct in6_addr in6_addr; > - char *addr_str = l_malloc(INET6_ADDRSTRLEN); > - > -- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); > -+ memcpy(in6_addr.s6_addr, addr, 16); > - > - if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, > - INET6_ADDRSTRLEN)))) { > --- > -cgit 1.2.3-1.el7 > - > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > index 7c010ed891..58224170e6 100644 > --- a/package/iwd/iwd.hash > +++ b/package/iwd/iwd.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc > -sha256 0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55 iwd-1.18.tar.xz > +sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > index 96bdc56e93..7b122811c5 100644 > --- a/package/iwd/iwd.mk > +++ b/package/iwd/iwd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -IWD_VERSION = 1.18 > +IWD_VERSION = 1.20 > IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz > IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless > IWD_LICENSE = LGPL-2.1+ _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 2021-12-01 9:52 [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 James Hilliard 2021-12-01 9:52 ` [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 James Hilliard @ 2021-12-01 20:36 ` Peter Seiderer 1 sibling, 0 replies; 4+ messages in thread From: Peter Seiderer @ 2021-12-01 20:36 UTC (permalink / raw) To: James Hilliard; +Cc: Matt Weber, buildroot Hello James, thanks for the update, but... On Wed, 1 Dec 2021 02:52:24 -0700, James Hilliard <james.hilliard1@gmail.com> wrote: > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Changelog is a nice to have, see [3] for example... > --- > package/ell/ell.hash | 2 +- > package/ell/ell.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/ell/ell.hash b/package/ell/ell.hash > index 84016c0ce0..20b568dde4 100644 > --- a/package/ell/ell.hash > +++ b/package/ell/ell.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc > -sha256 41a6f8fa4d285b52cb7a5a87bda3e7370ecaac02d94aaa7ec1a23f0480b8bc3f ell-0.44.tar.xz > +sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 47137e2530..4fad6e8d1b 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.44 > +ELL_VERSION = 0.46 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ At this phase of the buildroot release schedule (see [1] and [2]) version bumps which are not security related should be done against the next branch, which will conflict with your patch as there are already ell/iwd version bumps applied (see [3] and [4])... [1] https://buildroot.org/downloads/manual/manual.html#RELENG [2] http://lists.busybox.net/pipermail/buildroot/2021-November/629532.html [3] https://git.buildroot.net/buildroot/commit/?h=next&id=ab4e346c52b804949c9e2da2e4374654e0abe54d [4] https://git.buildroot.net/buildroot/commit/?h=next&id=ff0d53405157ce82f6b56c74654c75c07b9ce92d _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-01 20:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-01 9:52 [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 James Hilliard 2021-12-01 9:52 ` [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.20 James Hilliard 2021-12-01 20:40 ` Peter Seiderer 2021-12-01 20:36 ` [Buildroot] [PATCH 1/2] package/ell: bump to version 0.46 Peter Seiderer
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.